Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
1a88c2d
started adding sign in page
bryce13950 Oct 13, 2024
ddc090b
configured page a bit
bryce13950 Oct 13, 2024
bf76321
Merge branch 'feature/sign-in' into dev
bryce13950 Oct 14, 2024
8412246
Merge pull request #2 from ProjectAthenia/dev
bryce13950 Oct 14, 2024
e782d02
split sign in form out to separate component
bryce13950 Oct 14, 2024
8467a1c
Merge pull request #3 from ProjectAthenia/feature/styling
bryce13950 May 5, 2025
2fd72d8
imported current project status
bryce13950 May 5, 2025
b009b36
removed some gaming sections
bryce13950 May 5, 2025
0e2cd51
removed more gaming elements
bryce13950 May 5, 2025
87424aa
removed gaming linke
bryce13950 May 5, 2025
def98b2
removed additional game related data
bryce13950 May 5, 2025
08af2a1
removed more game related stuff
bryce13950 May 8, 2025
69394b1
removed type fields related to gaming
bryce13950 May 8, 2025
7768983
removed some files
bryce13950 May 8, 2025
0ca7989
removed more game things
bryce13950 May 8, 2025
76388f2
set correct mock name
bryce13950 May 8, 2025
609ec34
removed location mocking
bryce13950 May 8, 2025
f7d2595
updated mocking
bryce13950 May 8, 2025
bf06b43
created a requests sub directory
bryce13950 May 9, 2025
bca559f
fixed some tests
bryce13950 May 13, 2025
6f7e6e3
fixed soem tests
bryce13950 May 13, 2025
854a2d0
fixed some more testss
bryce13950 May 13, 2025
bcbc7da
fixed menu test
bryce13950 May 16, 2025
8a25d2c
fixed more tests
bryce13950 May 16, 2025
eca3322
fixed test
bryce13950 May 16, 2025
ad63e34
removed ag grid
bryce13950 May 16, 2025
2341c79
removed reference
bryce13950 May 17, 2025
d18f831
centralized mock category
bryce13950 May 17, 2025
347dc5f
deleted old components
bryce13950 May 17, 2025
05fcc31
removed release browser
bryce13950 May 17, 2025
96c1ed7
centralized mock collection
bryce13950 May 17, 2025
674f6b7
replaced mockCollections
bryce13950 May 17, 2025
4b31c0e
removed extra field
bryce13950 May 17, 2025
9bc0937
centralized mock user
bryce13950 May 17, 2025
5bc789d
remvoed post stuff
bryce13950 May 20, 2025
05812ef
removed bad import
bryce13950 May 20, 2025
28f42b4
centralized pagination mocking
bryce13950 May 20, 2025
a55f72e
centralized another pagination mock
bryce13950 May 20, 2025
afa7861
removed ion reference
bryce13950 May 20, 2025
07e87c4
centralized mocks
bryce13950 May 20, 2025
985a972
fixed test
bryce13950 May 20, 2025
7a7f971
simplified test
bryce13950 May 20, 2025
ceb1e01
updated test
bryce13950 May 20, 2025
cee9791
fixed test
bryce13950 May 20, 2025
b89207d
cleaned up mockCollectionItemsContext
bryce13950 May 22, 2025
8dc23a5
removed extra forms
bryce13950 May 22, 2025
b659b56
removed rsync exclude file
bryce13950 May 22, 2025
d67d2b1
replaced autocomplete with centralized mock
bryce13950 May 22, 2025
29a2971
renamed modal
bryce13950 May 22, 2025
8c5e8e0
changed class
bryce13950 May 22, 2025
44089ae
removed ion references
bryce13950 May 22, 2025
b16cc7b
removed extra link
bryce13950 May 22, 2025
27a68b5
cleaned up model mocks a bit
bryce13950 May 22, 2025
57283dd
changed to use mockcategory
bryce13950 May 22, 2025
aa519d4
changed home link
bryce13950 May 22, 2025
6591835
used mock category function
bryce13950 May 22, 2025
990daa7
mocked more categories
bryce13950 May 22, 2025
519ec90
restored type
bryce13950 May 22, 2025
afb2ead
removed old script
bryce13950 May 22, 2025
4047939
removed swiper things
bryce13950 May 22, 2025
342c4ee
cleaned up test
bryce13950 May 22, 2025
4aff86f
removed more ion references
bryce13950 May 22, 2025
3f6190f
removed additional ion references
bryce13950 May 22, 2025
114457a
removed font
bryce13950 May 22, 2025
4d1b5d2
exported remaining mocks
bryce13950 May 22, 2025
5315d49
updated contexts mock to use centralized mock
bryce13950 May 22, 2025
beaadd2
removed extra sign in form
bryce13950 May 22, 2025
153a390
removed extra file
bryce13950 May 22, 2025
ba78d47
emptied home page
bryce13950 May 22, 2025
a29d526
fixed test
bryce13950 May 22, 2025
a83b059
Merge pull request #4 from ProjectAthenia/upsteam-match
bryce13950 May 22, 2025
fcf85ef
added update script
bryce13950 May 22, 2025
23ecea2
added initial github workflows
bryce13950 May 23, 2025
edd4499
updated update script to handle renames better
bryce13950 May 23, 2025
f652b09
made report token optional
bryce13950 May 27, 2025
a07ac39
Merge pull request #5 from ProjectAthenia/ci-actions
bryce13950 May 27, 2025
f529b6b
fixed some line issues
bryce13950 May 27, 2025
9166d13
ran some audits, and fixed some lint errors
bryce13950 May 27, 2025
f152a4d
cleaned up code a bit more
bryce13950 May 27, 2025
005b60c
updated some utils
bryce13950 May 27, 2025
fb38ca8
fixed lock file issues
bryce13950 May 27, 2025
3b9db05
updated dependencies
bryce13950 May 28, 2025
3a06ce7
updated severity check
bryce13950 May 28, 2025
0066983
fixed some lint issues
bryce13950 May 28, 2025
a54c7bc
fixed some tests
bryce13950 May 28, 2025
bb3945b
fixed tets and ling error
bryce13950 May 28, 2025
f14c432
fixed test
bryce13950 May 30, 2025
386b945
updated max warning
bryce13950 May 30, 2025
6492f77
updated ts and fixed resulting issues
bryce13950 May 30, 2025
97a5193
updated react-scripts
bryce13950 May 30, 2025
f2026b9
got tests to pass
bryce13950 May 30, 2025
f6e3917
renoved ci rstrictions
bryce13950 May 30, 2025
31cd1d4
fixed some lint errors
bryce13950 May 30, 2025
7906bf1
updated pacakges
bryce13950 May 30, 2025
7ce6184
removed old test
bryce13950 May 30, 2025
776b062
removed some old references
bryce13950 May 30, 2025
b3dd0b4
fixed some more issues
bryce13950 May 30, 2025
79bdeba
fixed test
bryce13950 May 30, 2025
361823e
fixed some lint issues
bryce13950 May 31, 2025
7304abb
fixed some lint issues
bryce13950 Jun 4, 2025
de7f22c
fixed tests
bryce13950 Jun 4, 2025
ae3a07e
fixed some lint items
bryce13950 Jun 4, 2025
4aa6f4a
fixed lint errors
bryce13950 Jun 4, 2025
02cc063
fixed some lint issues
bryce13950 Jun 4, 2025
f87ec36
fixed warning again
bryce13950 Jun 4, 2025
6866bc8
fixed a warning
bryce13950 Jun 4, 2025
221997c
fixed more lint ieeus
bryce13950 Jun 4, 2025
480962f
fixed more lint issues
bryce13950 Jun 4, 2025
a548138
fixed some lint issues
bryce13950 Jun 4, 2025
c25267a
cleaned up test
bryce13950 Jun 4, 2025
5f734b4
fixed test
bryce13950 Jun 4, 2025
27cac14
fixed some lint issues
bryce13950 Jun 4, 2025
903bc2c
fixed some lint issues
bryce13950 Jun 4, 2025
5318486
fixed some more lint issues
bryce13950 Jun 5, 2025
e37f39e
fixed some lint issues
bryce13950 Jun 5, 2025
790d891
fixed some more lint issues
bryce13950 Jun 5, 2025
6056228
fixed some more lint errors
bryce13950 Jun 5, 2025
8b0899b
fixed some more lint errors
bryce13950 Jun 5, 2025
2a4ffde
fixed more lint errors
bryce13950 Jun 5, 2025
3aa7f36
fixed some lint issues
bryce13950 Jun 5, 2025
9f71b45
fixed some more lint items
bryce13950 Jun 5, 2025
77c9f42
fixed more issues
bryce13950 Jun 5, 2025
d634153
fixed remaining lint issues
bryce13950 Jun 5, 2025
0b3a00d
fixed some type script issues
bryce13950 Jun 6, 2025
f3d89a4
fixed some more typing issues
bryce13950 Jun 6, 2025
3032561
fixed some more errors
bryce13950 Jun 6, 2025
8f7728c
fixed some errors
bryce13950 Jun 6, 2025
5c6bb5b
fixed some lint errors
bryce13950 Jun 6, 2025
7863b58
claned up more lint issues
bryce13950 Jun 6, 2025
d15428f
fixed some more lint errors
bryce13950 Jun 6, 2025
9e273de
fixed some more errors
bryce13950 Jun 6, 2025
a9d5e44
fixed last issue
bryce13950 Jun 6, 2025
6f8e8ed
updated action
bryce13950 Jun 6, 2025
f530527
restored mock user
bryce13950 Jun 10, 2025
501364c
updated props
bryce13950 Jun 11, 2025
d807872
added props with children
bryce13950 Jun 14, 2025
944b394
added interface properly
bryce13950 Jun 14, 2025
01fae72
remoed redundant props
bryce13950 Jun 14, 2025
63b99d2
fixed another component
bryce13950 Jun 14, 2025
c54cc6d
removed extra param
bryce13950 Jun 14, 2025
573b723
restored default
bryce13950 Jun 14, 2025
2dc7e5b
removed comment
bryce13950 Jun 14, 2025
5af4d13
made search more generica
bryce13950 Jun 14, 2025
3d6c683
removed extra comments
bryce13950 Jun 14, 2025
f8401ba
removed extra comments
bryce13950 Jun 14, 2025
3aaa1f0
cleaned up actions
bryce13950 Jun 14, 2025
c5901b5
fixed some lint items
bryce13950 Jun 15, 2025
c83c5ed
fixed some typing issues
bryce13950 Jun 16, 2025
8b7c023
removed managing business id
bryce13950 Jun 16, 2025
8d42f7e
decoupled states again
bryce13950 Jun 19, 2025
11f5faf
removed extra prop
bryce13950 Jun 19, 2025
cdebd4c
removed default variables
bryce13950 Jun 19, 2025
980bdc3
fixed function
bryce13950 Jun 19, 2025
ca36ae6
cleaned up more model
bryce13950 Jun 19, 2025
d2401c7
created entity
bryce13950 Jun 19, 2025
5570af8
cleaned up collection item a bit
bryce13950 Jun 19, 2025
0f175ad
improved typing for organization requests
bryce13950 Jun 19, 2025
62260b2
used correct type
bryce13950 Jun 19, 2025
e3b7bc4
removed old requests
bryce13950 Jun 19, 2025
2cddcea
removed extra function
bryce13950 Jun 19, 2025
ccfb1db
removed comment
bryce13950 Jun 19, 2025
469967a
removed somed extra functions
bryce13950 Jun 19, 2025
4fde531
cleaned up category mocks
bryce13950 Jun 19, 2025
97dd687
resolved lint issue
bryce13950 Jun 19, 2025
3f4e194
removed old context
bryce13950 Jun 19, 2025
3c7e79f
fixed some lint issues
bryce13950 Jun 19, 2025
b2fac2e
fixed more lint issues
bryce13950 Jun 19, 2025
49d460c
Merge pull request #7 from ProjectAthenia/ts-upgrade
bryce13950 Jun 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_API_URL="http://localhost:8083"
50 changes: 50 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
module.exports = {
extends: [
'react-app',
'react-app/jest'
],
parserOptions: {
project: './tsconfig.json',
tsconfigRootDir: __dirname,
warnOnUnsupportedTypeScriptVersion: false // Suppress TypeScript version warnings
},
rules: {
// TypeScript rules - make them warnings instead of errors
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-unused-vars': ['warn', { 'vars': 'all', 'args': 'after-used', 'ignoreRestSiblings': true }],
'@typescript-eslint/no-use-before-define': 'warn',
'@typescript-eslint/no-useless-constructor': 'warn',

// React Hook rules - make them warnings
'react-hooks/exhaustive-deps': 'warn',

// General JS rules
'eqeqeq': ['warn', 'always'],
'no-empty-pattern': 'warn',
'no-useless-escape': 'warn',

// Testing Library rules - make critical ones errors, others warnings
'testing-library/no-wait-for-multiple-assertions': 'warn',
'testing-library/no-node-access': 'warn', // Made this a warning instead of error

// Turn off some overly strict rules
'no-console': 'off',
'@typescript-eslint/ban-ts-comment': 'off'
},
overrides: [
{
files: ['**/__tests__/**/*', '**/*.{test,spec}.*'],
rules: {
// Relax rules for test files
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'testing-library/no-node-access': 'off' // Allow direct node access in tests if needed
}
}
],
ignorePatterns: [
'vite.config.ts',
],
};
58 changes: 58 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: CI

on:
push:

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- name: Install dependencies
run: npm ci

- name: Run tests
run: npm test -- --coverage --watchAll=false

- name: Upload coverage reports
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: false

build:
needs: test
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '18.x'
cache: 'npm'

- name: Install dependencies
run: npm ci

- name: Build
run: npm run build

- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: build
path: build/
58 changes: 58 additions & 0 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Code Quality

on:
push:

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '18.x'
cache: 'npm'

- name: Install dependencies
run: npm ci

- name: Run ESLint
run: |
if npm list eslint &>/dev/null; then
# Run ESLint and allow more warnings for legacy codebase
npx eslint src --ext .ts,.tsx,.js,.jsx --max-warnings 300
else
echo "ESLint not configured, skipping"
fi

- name: Type check
run: npx tsc --noEmit

security:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '18.x'
cache: 'npm'

- name: Install dependencies
run: npm ci

- name: Run npm audit
run: npm audit --production --audit-level=critical

- name: Run Snyk to check for vulnerabilities
if: env.SNYK_TOKEN != ''
uses: snyk/actions/node@master
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
with:
args: --severity-threshold=critical
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
**.orig

npm-debug.log*
yarn-debug.log*
Expand Down
13 changes: 13 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Athenia</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/index.tsx"></script>
</body>
</html>
44 changes: 44 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
module.exports = {
preset: 'ts-jest',
testEnvironment: 'jsdom',
setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
testTimeout: 10000, // 10 second timeout for each test
extensionsToTreatAsEsm: ['.ts', '.tsx'],
moduleNameMapper: {
'\\.(css|less|scss|sass)$': 'identity-obj-proxy',
'^@/(.*)$': '<rootDir>/src/$1',
'^src/services/api$': '<rootDir>/src/test-utils/mocks/__mocks__/api.ts',
},
transform: {
'^.+\\.(ts|tsx)$': ['ts-jest', {
useESM: true,
tsconfig: {
jsx: 'react-jsx',
moduleResolution: 'node',
target: 'ES2020',
module: 'ESNext',
esModuleInterop: true,
allowSyntheticDefaultImports: true,
}
}],
'^.+\\.(js|jsx)$': ['babel-jest', { presets: ['@babel/preset-env', '@babel/preset-react'] }],
},
transformIgnorePatterns: [
'/node_modules/(?!(@mantine|@emotion|cheerio|parse5|entities|dom-serializer|htmlparser2|domelementtype|domhandler|domutils)/)',
],
testMatch: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'],
collectCoverageFrom: [
'src/**/*.{js,jsx,ts,tsx}',
'!src/index.tsx',
'!src/reportWebVitals.ts',
'!src/setupTests.ts',
],
globals: {
'ts-jest': {
useESM: true,
tsconfig: {
jsx: 'react-jsx',
}
}
}
};
Loading
Loading