Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
204 commits
Select commit Hold shift + click to select a range
96bc741
Create license.txt
adhocmaster Jan 26, 2024
46f40dd
Created node.js.yml using template
anlhu Jan 29, 2024
dd9e305
Run tests on any push, need to install dependencies?
anlhu Jan 29, 2024
942b687
only want Node version 21
anlhu Jan 29, 2024
94ea012
build/test in frontend/backend
anlhu Jan 29, 2024
fa89818
need to install before testing
anlhu Jan 29, 2024
32e6833
Environment variable to ignore warnings, compress commands
anlhu Jan 29, 2024
6bcc203
Separate installs and builds and test, do backend first
anlhu Jan 29, 2024
8f297da
Backend build requires NodeNext here
anlhu Jan 29, 2024
aa29bd5
run frontend first, tests may fail now
anlhu Jan 29, 2024
05b84ea
fix disallowed 3 layer reference, comment out default frontent test
anlhu Jan 30, 2024
dd2a41d
Merge branch 'github-actions' of github.com:adhocmaster/ScrumMate int…
anlhu Jan 30, 2024
74edcea
get backend tests working using jest
anlhu Jan 30, 2024
c893ea9
badge on README.md
anlhu Jan 30, 2024
1a1e443
fix badge on README
anlhu Jan 30, 2024
dc8aeae
rename frontend test since it is just a sample
anlhu Jan 30, 2024
6663f71
Merge branch 'github-actions' of github.com:adhocmaster/ScrumMate int…
anlhu Jan 30, 2024
ef23732
switch position from static to absolute so there is not white above it
anlhu Jan 30, 2024
930f72e
fix backend test file name
anlhu Jan 30, 2024
ec674fa
in-memory version of mongodb dependency, for testing
anlhu Jan 31, 2024
e092363
no more db test, switching to typeorm anyway
anlhu Feb 4, 2024
fc178d8
Merge pull request #2 from adhocmaster/fix-navbar-position
arthurrfoy Feb 4, 2024
c977d1f
Merge pull request #1 from adhocmaster/github-actions
anlhu Feb 4, 2024
27645f4
removed node modules
mialaniz Feb 4, 2024
8e905dc
readme change
Feb 4, 2024
0a13cf4
Merge pull request #3 from adhocmaster/remove_node_modules_backend
mialaniz Feb 4, 2024
12da701
changed the register page to not open a new tab, remove redundant rou…
echen70 Feb 4, 2024
95257f3
testing
tanyagyanmote Feb 4, 2024
5d8690f
Merge pull request #4 from adhocmaster/removeNode
anlhu Feb 4, 2024
75f6d24
Merge pull request #6 from adhocmaster/testpr
tanyagyanmote Feb 4, 2024
168b2d3
Merge pull request #5 from adhocmaster/minor-ui-changes
echen70 Feb 4, 2024
9a6d248
enter or clicking the sign in button logs user in
echen70 Feb 6, 2024
1295a4c
TypeORM Files
mialaniz Feb 9, 2024
31603c3
initialize project in tests dir
anlhu Feb 9, 2024
cf49b8c
data model updated
adhocmaster Feb 9, 2024
37bb3e6
Merge branch 'main' of https://github.com/adhocmaster/ScrumMate
adhocmaster Feb 9, 2024
8278d06
user and project entities bare bones
anlhu Feb 12, 2024
b040696
rest of entity files, unrevised, sprint needs more fields
anlhu Feb 12, 2024
fa5168a
updated entities list so can relational each other
anlhu Feb 12, 2024
edd534e
formatting, unpacked user auth
anlhu Feb 12, 2024
ff455b0
added some express route testing
anlhu Feb 13, 2024
b48bb03
moved entity files
mialaniz Feb 13, 2024
a7bdd52
setup for first typeorm test
anlhu Feb 13, 2024
2d017b0
user/proj test works, get/add methods
anlhu Feb 14, 2024
5054608
add remove method
anlhu Feb 14, 2024
7c030d3
Merge pull request #7 from adhocmaster/minor-ui-changes
arthurrfoy Feb 14, 2024
855c66b
delete MyProject
anlhu Feb 15, 2024
6714b31
Merge pull request #9 from adhocmaster/typeorm_files
anlhu Feb 15, 2024
09d2d5c
Added Function for saveReleasePlan
mialaniz Feb 16, 2024
9db112f
Added More Comments
mialaniz Feb 16, 2024
19528e3
Update data_model.md
adhocmaster Feb 16, 2024
76ab3a3
Merge branch 'main' of https://github.com/adhocmaster/ScrumMate
adhocmaster Feb 16, 2024
8136bba
Update data_model.md
adhocmaster Feb 16, 2024
d651fa5
Update data_model.md
adhocmaster Feb 16, 2024
49fa452
Added Functions for Saving Release Plan
mialaniz Feb 17, 2024
c8fdab6
reconfigure data models to meet sponsor requirements
anlhu Feb 17, 2024
3806f1b
deviating from sponsor's diagram, using subclasses instead of one bac…
anlhu Feb 17, 2024
0da28ea
finished up rest of entities, formatting
anlhu Feb 17, 2024
4166507
format entities, add missing methods, complete TypeORM Tests for savi…
anlhu Feb 18, 2024
8eb0692
trying to add postgres containter to the github actions
anlhu Feb 18, 2024
9aa0728
route api works, but file in wrong place
anlhu Feb 19, 2024
e181ec1
Merge pull request #11 from adhocmaster/typeorm_files
mialaniz Feb 19, 2024
653b34d
Added Function for saveReleasePlan
mialaniz Feb 16, 2024
e76b179
Added More Comments
mialaniz Feb 16, 2024
203cbc8
Added Functions for Saving Release Plan
mialaniz Feb 17, 2024
38c07a4
route api works, but file in wrong place
anlhu Feb 19, 2024
31fefd6
Merge branch 'load-versions' of github.com:adhocmaster/ScrumMate into…
anlhu Feb 19, 2024
5587a5c
update data-source wit hnew entities
anlhu Feb 19, 2024
e9d5adb
fix import
anlhu Feb 19, 2024
9c68d27
moved router back to controllers/, still works with postman
anlhu Feb 19, 2024
ab8600e
formatting
anlhu Feb 19, 2024
ba3d572
'tests' done for saving a release plan, but must be commented out
anlhu Feb 20, 2024
f4c8a4c
revert code to just create a new release. Comment out 'test'
anlhu Feb 20, 2024
70e5f5a
undoing some of michael's things for this PR
anlhu Feb 20, 2024
832c3e2
undoing more
anlhu Feb 20, 2024
abf9409
move to router folder
anlhu Feb 20, 2024
cccc3c6
Merge pull request #12 from adhocmaster/load-versions
arthurrfoy Feb 20, 2024
5eaee5c
router for fetching previous releases done
anlhu Feb 20, 2024
00c6463
comment out everything in index for PR
anlhu Feb 20, 2024
e1ed82b
Merge pull request #13 from adhocmaster/actually-load-release-versions
arthurrfoy Feb 20, 2024
5c7f061
initial code for save release
anlhu Feb 20, 2024
a472553
successfully saves release columns in postman, missing relationals
anlhu Feb 20, 2024
57adba6
add possible future code for create_release
anlhu Feb 20, 2024
ceed35a
add comment for saving sprints
anlhu Feb 20, 2024
d8b14c3
.
Feb 20, 2024
33b6652
commenting out things
anlhu Feb 20, 2024
0100a47
Merge pull request #14 from adhocmaster/save-release-andrew
mialaniz Feb 20, 2024
aefe12e
copy
Feb 20, 2024
c1b1cdd
Merge branch 'main' into releaseCopy
anlhu Feb 20, 2024
24bb0b6
Update create_release.ts, fix merge
anlhu Feb 20, 2024
3841b1c
Update create_release.ts, fix dup import
anlhu Feb 20, 2024
1defdc9
Merge pull request #15 from adhocmaster/releaseCopy
anlhu Feb 20, 2024
1d7c0f2
new api user, project. format release. some not nullable columns added
anlhu Feb 21, 2024
5d9bdbe
move fetch, formatting
anlhu Feb 21, 2024
53950d4
fix tests, less strict not nullable
anlhu Feb 21, 2024
8d90c6f
roles and sprint, formatting to user, release, proj
anlhu Feb 21, 2024
4e3a11e
todo router, fix sprint
anlhu Feb 21, 2024
992b80f
formatting, commentting, app use routers
anlhu Feb 21, 2024
f85b0fb
user controller
Feb 21, 2024
360d72c
supertest
anlhu Feb 21, 2024
3e1f83c
supertest types
anlhu Feb 21, 2024
2e68305
formatting, clear db after
anlhu Feb 21, 2024
78f0150
routing
Feb 22, 2024
71109e7
WIP, but updated Nav Bar, Sidebar, and parts of the Release Plan
echen70 Feb 23, 2024
635e68f
added Backlog ui, Sprints ui WIP
echen70 Feb 23, 2024
e0ceb90
adding button for backlog
tanyagyanmote Feb 23, 2024
b92405b
drag/drop work
mialaniz Feb 25, 2024
b3670d3
fix path, comment out old, formatting, fix imports
anlhu Feb 25, 2024
e65ee10
adding
Feb 25, 2024
6174570
refactored view release plan page
echen70 Feb 25, 2024
2460b04
adding
Feb 25, 2024
1eb7d40
Database wrapper starter code and tests
anlhu Feb 26, 2024
a5391da
add user methods and tests to database class
anlhu Feb 26, 2024
a2b3cda
project methods and tests
anlhu Feb 26, 2024
2344694
release methods
anlhu Feb 26, 2024
a2ed414
role methods, no tests
anlhu Feb 26, 2024
b4c6e7f
sprint methods, no tests
anlhu Feb 26, 2024
8d1931e
comment for TODO methods but no implementation. Do it after fixing TO…
anlhu Feb 26, 2024
badc001
Merge branch 'remaining-api' into data-source-wrapper
anlhu Feb 26, 2024
39c5bb4
Merge pull request #17 from adhocmaster/data-source-wrapper
arthurrfoy Feb 26, 2024
ff1037a
Changes to Functions
mialaniz Feb 26, 2024
bbafd87
updating backlog
tanyagyanmote Feb 26, 2024
47a61bf
make express tests pass. do we want to include /api/ in our routers?
anlhu Feb 27, 2024
4788b30
remove log
anlhu Feb 27, 2024
f45b202
moved tests into directories
anlhu Feb 27, 2024
a84b22f
Merge pull request #18 from adhocmaster/rename-todo
anlhu Feb 27, 2024
c622309
remove extra await
anlhu Feb 27, 2024
2b4eff1
disable logging
anlhu Feb 27, 2024
836c4b9
run in a single thread instead of multiple, so tests dont collide hop…
anlhu Feb 27, 2024
eec247f
tests terminate despite async methods not finishing. Probably before/…
anlhu Feb 27, 2024
c114ec1
Merge pull request #16 from adhocmaster/remaining-api
arthurrfoy Feb 27, 2024
108daa6
user controllers use Database
anlhu Feb 27, 2024
d8f6562
project controllers
anlhu Feb 27, 2024
a15351e
role controllers with db
anlhu Feb 27, 2024
615d8a5
sprint controllers with db
anlhu Feb 27, 2024
d45f6af
todo controller with db
anlhu Feb 27, 2024
fed9f7b
renaming todo files to backlogItem
anlhu Feb 27, 2024
682cefe
make sure dont erase previous relations
anlhu Feb 27, 2024
16061ee
made sprints scrollable when there are more user stories
echen70 Feb 27, 2024
96a22ad
new errors, helper methds, backlog errors
anlhu Feb 28, 2024
f23dce1
still need to catch errors for project, release, roles, sprints
anlhu Feb 28, 2024
aed674b
refactor all try/catch into one error Wrapper
anlhu Feb 28, 2024
6e75a85
Merge pull request #20 from adhocmaster/response-codes
arthurrfoy Feb 28, 2024
208f440
Merge pull request #19 from adhocmaster/wrapper-in-API
arthurrfoy Feb 28, 2024
2c82db2
tests
Feb 29, 2024
d53b259
test
Feb 29, 2024
c489e9e
Navbar Feature
mialaniz Feb 29, 2024
e3f41fd
WIP, but updated Nav Bar, Sidebar, and parts of the Release Plan
echen70 Feb 23, 2024
354edf8
added Backlog ui, Sprints ui WIP
echen70 Feb 23, 2024
14ade9f
drag/drop work
mialaniz Feb 25, 2024
56bfa3d
Changes to Functions
mialaniz Feb 26, 2024
0557a7d
Navbar Feature
mialaniz Feb 29, 2024
6be7c8e
Merge branch 'drag_drop' of github.com:adhocmaster/ScrumMate into dra…
anlhu Feb 29, 2024
08fb5a1
new getname function
anlhu Feb 29, 2024
7758d05
tests
Feb 29, 2024
367f717
await the function in wrapper
anlhu Feb 29, 2024
4719442
close server
anlhu Feb 29, 2024
4e0c6de
fix endpoint
anlhu Feb 29, 2024
0c3057b
make tests pass by commenting out last team code
anlhu Feb 29, 2024
97b92de
icons can be toggled
anlhu Feb 29, 2024
49d92ac
Added the correct end points
mialaniz Mar 1, 2024
63efbd7
sign -in
Mar 1, 2024
bdc4292
Merge branch 'wrapper-in-API' of github.com-school:adhocmaster/ScrumM…
Mar 1, 2024
8611c49
moved commits from Revisions bc rebase doesnt allow login. Also, copy…
anlhu Mar 1, 2024
c356583
made sprint look like design
echen70 Mar 1, 2024
2bfbed1
Merge pull request #23 from adhocmaster/new-release-plan-ui
echen70 Mar 1, 2024
0bea309
Merge pull request #22 from adhocmaster/revisions-new-branch
anlhu Mar 1, 2024
b0327b7
Merge branch 'new-release-plan-ui' of github.com:adhocmaster/ScrumMat…
anlhu Mar 1, 2024
d51c9db
add sidebar stuff for demo. already in main
anlhu Mar 1, 2024
1676de1
made font size smaller, made the user story text turn to ... if too long
echen70 Mar 1, 2024
8fae5d9
changed font size to 14
echen70 Mar 1, 2024
41d2ddb
changed ... for user stories
echen70 Mar 1, 2024
a35b087
made icons smaller to fit the smaller font size
echen70 Mar 1, 2024
bd6d15f
moved the truncate function and update the height of the card
echen70 Mar 1, 2024
054ec46
Merge branch 'main' into new-release-plan-ui
anlhu Mar 2, 2024
509933e
Merge pull request #25 from adhocmaster/new-release-plan-ui
echen70 Mar 2, 2024
3ec5085
Actually fix the syntax error this time
anlhu Mar 2, 2024
d9f1313
Merge pull request #27 from adhocmaster/fix-fix-syntax-error
anlhu Mar 2, 2024
ec5999c
fix syntax tests
anlhu Mar 2, 2024
2629e50
adding
Mar 2, 2024
2667a19
initialize user, project, 2 releases
anlhu Mar 2, 2024
10e3c41
new package, using a fake email now
anlhu Mar 2, 2024
e0c4835
commmiting before switching brach quickly
anlhu Mar 2, 2024
8b0bfe4
can add new release plans
anlhu Mar 2, 2024
7cf5cfc
loads list in reverse, format is correct
anlhu Mar 2, 2024
5299fd3
working on api with goal/problem/version number
anlhu Mar 2, 2024
d68420e
added getRelease API, unable to switch pages when clicking on sidebar
anlhu Mar 2, 2024
3f2a1be
works???
anlhu Mar 2, 2024
110df0d
Added Endpoints
mialaniz Mar 2, 2024
caa0c22
delete all from db every time so its fresh
anlhu Mar 2, 2024
4b7e70a
Merge branch 'main' into drag_drop
anlhu Mar 2, 2024
e0ecc13
new code to fetch the most recent release as the default
anlhu Mar 2, 2024
8c3712c
test
Mar 2, 2024
c1e0356
open to most recent release
anlhu Mar 2, 2024
d6d18e3
tests
Mar 2, 2024
4ad8d2e
Merge pull request #28 from adhocmaster/connect-with-backend
arthurrfoy Mar 2, 2024
d534f10
test
Mar 2, 2024
d283ee6
test
Mar 2, 2024
227ed92
remove console loging
Mar 2, 2024
2d3c071
Merge branch 'main' into wrapper-in-API
anlhu Mar 2, 2024
0a7303e
Update project.ts, undo newProject in endpoint
anlhu Mar 2, 2024
5c8ecc7
Update project.ts, remove userId from creating project
anlhu Mar 2, 2024
ed28f8a
Merge pull request #32 from adhocmaster/wrapper-in-API
anlhu Mar 2, 2024
103079e
Merge branch 'main' into drag_drop
anlhu Mar 2, 2024
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file modified .DS_Store
Binary file not shown.
53 changes: 53 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Node.js CI

on: [push, workflow_dispatch]

env:
CI: false # to not treat warnings as failures

jobs:
build:

runs-on: ubuntu-latest

services:
postgres:
image: postgres

env:
POSTGRES_PASSWORD: test
POSTGRES_USER: test
POSTGRES_DB: test

options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5432:5432

strategy:
matrix:
node-version: [21]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm install && (cd frontend && npm install) && (cd backend && npm install)

- run: (cd frontend && npm run build)
- run: (cd frontend && npm test --watchAll)

- run: (cd backend && npm run build)
- run: (cd backend && npm test --watchAll)

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
The page will reload when you make changes.\
You may also see any lint errors in the console.

### `npm test`
### `npm test` ![Node.js Cl](https://github.com/adhocmaster/ScrumMate/actions/workflows/node.js.yml/badge.svg)

https://github.com/adhocmaster/ScrumMate/actions/workflows/node.js.yml/badge.svg
Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

Expand Down
Binary file added backend/.DS_Store
Binary file not shown.
6 changes: 6 additions & 0 deletions backend/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
transform: {'^.+\\.ts?$': 'ts-jest'},
testEnvironment: 'node',
testRegex: '/tests/.*\\.(test|spec)?\\.(ts|tsx)$',
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node']
};
1 change: 0 additions & 1 deletion backend/node_modules/.bin/acorn

This file was deleted.

17 changes: 0 additions & 17 deletions backend/node_modules/.bin/acorn.cmd

This file was deleted.

28 changes: 0 additions & 28 deletions backend/node_modules/.bin/acorn.ps1

This file was deleted.

1 change: 0 additions & 1 deletion backend/node_modules/.bin/mime

This file was deleted.

17 changes: 0 additions & 17 deletions backend/node_modules/.bin/mime.cmd

This file was deleted.

28 changes: 0 additions & 28 deletions backend/node_modules/.bin/mime.ps1

This file was deleted.

1 change: 0 additions & 1 deletion backend/node_modules/.bin/nodemon

This file was deleted.

17 changes: 0 additions & 17 deletions backend/node_modules/.bin/nodemon.cmd

This file was deleted.

28 changes: 0 additions & 28 deletions backend/node_modules/.bin/nodemon.ps1

This file was deleted.

1 change: 0 additions & 1 deletion backend/node_modules/.bin/nodetouch

This file was deleted.

17 changes: 0 additions & 17 deletions backend/node_modules/.bin/nodetouch.cmd

This file was deleted.

28 changes: 0 additions & 28 deletions backend/node_modules/.bin/nodetouch.ps1

This file was deleted.

1 change: 0 additions & 1 deletion backend/node_modules/.bin/nopt

This file was deleted.

17 changes: 0 additions & 17 deletions backend/node_modules/.bin/nopt.cmd

This file was deleted.

28 changes: 0 additions & 28 deletions backend/node_modules/.bin/nopt.ps1

This file was deleted.

1 change: 0 additions & 1 deletion backend/node_modules/.bin/semver

This file was deleted.

17 changes: 0 additions & 17 deletions backend/node_modules/.bin/semver.cmd

This file was deleted.

28 changes: 0 additions & 28 deletions backend/node_modules/.bin/semver.ps1

This file was deleted.

1 change: 0 additions & 1 deletion backend/node_modules/.bin/ts-node

This file was deleted.

1 change: 0 additions & 1 deletion backend/node_modules/.bin/ts-node-cwd

This file was deleted.

17 changes: 0 additions & 17 deletions backend/node_modules/.bin/ts-node-cwd.cmd

This file was deleted.

Loading