Skip to content

Commit 5c03336

Browse files
committed
Merge branch 'main' into framcc/auth-emulator
2 parents 0b17115 + a341169 commit 5c03336

File tree

78 files changed

+3811
-2302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+3811
-2302
lines changed

LICENSE-3RD-PARTY.md

Lines changed: 62 additions & 1616 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<h4 align="center">Flat management made simple.</h4>
77

88
<p align="center">
9-
<img alt="GitHub" src="https://img.shields.io/github/license/701-T4/flatshare?style=flat-square">
9+
<img alt="GitHub" src="https://img.shields.io/badge/license-MIT-blue">
1010
<img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/701-T4/flatshare/PR%20Check?label=tests&logo=github&style=flat-square">
1111
<img alt="GitHub repo size" src="https://img.shields.io/github/repo-size/701-T4/flatshare?style=flat-square">
1212
<img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/701-T4/flatshare?logo=github&style=flat-square">
@@ -51,14 +51,15 @@ $ cd flatshare
5151

5252
# Install dependencies
5353
$ yarn install
54+
All third party dependencies used in this project are attributed in the LICENSE-3RD-PARTY files. The files are generated automatically when there is an update to the dependencies used.
5455

5556
# Run the app
5657
$ yarn start
5758
```
5859

5960
by default your application will be hosted at `http://localhost:3000`, while the
60-
api will be hosted at `http://localhost:4200/api`. If using the Firebase auth
61-
emulator, this will be hosted at `http://localhost:4000/auth`.These can be changed
61+
api will be hosted at `http://localhost:4200/api`. If using the Firebase auth
62+
emulator, this will be hosted at `http://localhost:4000/auth`.These can be changed
6263
in the config/environment values. See the `contributing` section below for more
6364
details on running the app.
6465

packages/backend/LICENSE-3RD-PARTY.md

Lines changed: 144 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/backend/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
"@nestjs/passport": "^8.2.1",
3030
"@nestjs/platform-express": "^8.0.0",
3131
"@nestjs/swagger": "^5.2.0",
32+
"class-transformer": "^0.5.1",
33+
"class-validator": "^0.13.2",
3234
"firebase-admin": "^10.0.2",
3335
"mongoose": "^6.2.4",
3436
"passport": "^0.5.2",

packages/backend/src/app.module.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ import { ConfigModule } from '@nestjs/config';
33
import { APIController } from './controllers/api.controller';
44
import { UsersModule } from './controllers/users/users.module';
55
import { HouseModule } from './controllers/house/house.module';
6+
import { NoteModule } from './controllers/note/note.module';
7+
import { BillModule } from './controllers/bills/bills.module';
68
import { MongooseModule } from '@nestjs/mongoose';
79
import { PassportModule } from '@nestjs/passport';
10+
import { TaskModule } from './controllers/tasks/tasks.module';
811

912
@Module({
1013
controllers: [APIController],
@@ -16,10 +19,13 @@ import { PassportModule } from '@nestjs/passport';
1619
: '.env.production',
1720
isGlobal: true,
1821
}),
22+
MongooseModule.forRoot(process.env.DATABASE_URL),
1923
UsersModule,
2024
HouseModule,
21-
MongooseModule.forRoot(process.env.DATABASE_URL),
25+
NoteModule,
2226
PassportModule,
27+
BillModule,
28+
TaskModule,
2329
],
2430
})
2531
export class AppModule {}

0 commit comments

Comments
 (0)