Skip to content

Commit 622b6cc

Browse files
authored
Merge pull request #8 from marcode24/dev
🌱 add production base url
2 parents ef61aa6 + dca34d5 commit 622b6cc

16 files changed

+419
-11
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,6 @@ testem.log
4141
# System files
4242
.DS_Store
4343
Thumbs.db
44+
45+
# Local Netlify folder
46+
.netlify

angular.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@
103103
"src/favicon.ico",
104104
"src/assets"
105105
],
106+
"stylePreprocessorOptions": {
107+
"includePaths": [
108+
"src/assets/scss"
109+
]
110+
},
106111
"styles": [
107112
"src/styles.scss"
108113
],

karma.conf.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ module.exports = function (config) {
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage'),
13-
require('@angular-devkit/build-angular/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma'),
14+
require('karma-mocha-reporter'),
1415
],
1516
client: {
1617
jasmine: {
@@ -32,12 +33,18 @@ module.exports = function (config) {
3233
{ type: 'text-summary' }
3334
]
3435
},
35-
reporters: ['progress', 'kjhtml'],
36+
reporters: ['mocha'],
3637
port: 9876,
3738
colors: true,
3839
logLevel: config.LOG_INFO,
3940
autoWatch: true,
40-
browsers: ['Chrome'],
41+
browsers: ['ChromeHeadless'],
42+
customLaunchers: {
43+
ChromeHeadlessCI: {
44+
base: 'ChromeHeadless',
45+
flags: ['--no-sandbox']
46+
}
47+
},
4148
singleRun: false,
4249
restartOnFileChange: true
4350
});

package-lock.json

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

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"build": "ng build",
88
"watch": "ng build --watch --configuration development",
99
"test": "ng test",
10+
"test:cov": "npm run test -- --no-watch --code-coverage --browsers=ChromeHeadlessCI",
1011
"lint": "ng lint",
1112
"lint:fix": "npx eslint src/app/**/*.{js,jsx,ts,tsx,html} --quiet --fix",
1213
"prepare": "husky install"
@@ -34,6 +35,7 @@
3435
"@angular-eslint/template-parser": "13.5.0",
3536
"@angular/cli": "~13.2.2",
3637
"@angular/compiler-cli": "~13.2.0",
38+
"@faker-js/faker": "^7.6.0",
3739
"@types/jasmine": "~3.10.0",
3840
"@types/node": "^12.11.1",
3941
"@typescript-eslint/eslint-plugin": "5.27.1",
@@ -51,6 +53,7 @@
5153
"karma-coverage": "~2.1.0",
5254
"karma-jasmine": "~4.0.0",
5355
"karma-jasmine-html-reporter": "~1.7.0",
56+
"karma-mocha-reporter": "^2.2.5",
5457
"lint-staged": "^13.2.1",
5558
"typescript": "~4.5.2"
5659
}

src/app/core/mocks/file.mock.ts

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { faker } from '@faker-js/faker';
2+
3+
import { File } from "@models/file.model";
4+
5+
import { getOneFolderMock } from './folder.mock';
6+
7+
export const getOneFileMock = (): File => ({
8+
name: faker.system.fileName(),
9+
cloudName: faker.system.fileName(),
10+
size: faker.datatype.number(),
11+
permision: [],
12+
owner: {
13+
email: faker.internet.email(),
14+
password: faker.internet.password(),
15+
name: faker.name.firstName(),
16+
surname: faker.name.lastName(),
17+
image: faker.image.avatar(),
18+
active: faker.datatype.boolean(),
19+
darkMode: faker.datatype.boolean(),
20+
createdAt: faker.date.past(),
21+
updatedAt: faker.date.past(),
22+
rootFolder: getOneFolderMock(),
23+
totalSpace: faker.datatype.number(),
24+
usedSpace: faker.datatype.number(),
25+
_id: faker.datatype.uuid(),
26+
},
27+
createdAt: faker.date.past(),
28+
updatedAt: faker.date.past(),
29+
folder: getOneFolderMock(),
30+
type: faker.system.fileType(),
31+
_id: faker.datatype.uuid(),
32+
color: faker.internet.color(),
33+
path: [],
34+
});
35+
36+
export const getManyFilesMock = (quantity: number): File[] => {
37+
return Array.from({ length: quantity }).map(() => getOneFileMock());
38+
};

src/app/core/mocks/folder.mock.ts

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import { faker } from '@faker-js/faker';
2+
3+
import { Folder } from '@models/folder.model';
4+
5+
import { getOneUserMock } from './user.mock';
6+
7+
export const getOneFolderMock = (): Folder => ({
8+
name: faker.system.fileName(),
9+
size: faker.datatype.number(),
10+
permission: [],
11+
owner: {
12+
email: faker.internet.email(),
13+
password: faker.internet.password(),
14+
name: faker.name.firstName(),
15+
surname: faker.name.lastName(),
16+
image: faker.image.avatar(),
17+
active: faker.datatype.boolean(),
18+
darkMode: faker.datatype.boolean(),
19+
createdAt: faker.date.past(),
20+
updatedAt: faker.date.past(),
21+
rootFolder: null,
22+
totalSpace: faker.datatype.number(),
23+
usedSpace: faker.datatype.number(),
24+
_id: faker.datatype.uuid(),
25+
},
26+
createdAt: faker.date.past(),
27+
updatedAt: faker.date.past(),
28+
parent: null,
29+
type: faker.system.fileType(),
30+
folders: [],
31+
files: [],
32+
color: faker.internet.color(),
33+
path: [],
34+
_id: faker.datatype.uuid(),
35+
__v: faker.datatype.number(),
36+
});

src/app/core/mocks/user.mock.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { faker } from '@faker-js/faker';
2+
3+
import { User } from '@models/user.model';
4+
5+
import { getOneFolderMock } from './folder.mock';
6+
7+
export const getOneUserMock = (): User => ({
8+
email: faker.internet.email(),
9+
password: faker.internet.password(),
10+
name: faker.name.firstName(),
11+
surname: faker.name.lastName(),
12+
image: faker.image.avatar(),
13+
active: faker.datatype.boolean(),
14+
darkMode: faker.datatype.boolean(),
15+
createdAt: faker.date.past(),
16+
updatedAt: faker.date.past(),
17+
rootFolder: getOneFolderMock(),
18+
totalSpace: faker.datatype.number(),
19+
usedSpace: faker.datatype.number(),
20+
_id: faker.datatype.uuid(),
21+
});

src/app/core/models/folder.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class Folder {
1010
owner: User;
1111
createdAt: Date;
1212
updatedAt: Date;
13-
parent: Folder;
13+
parent: Folder | null;
1414
type: string;
1515
folders: Folder[];
1616
files: File[];

src/app/core/models/user.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class User {
1010
darkMode: boolean;
1111
createdAt: Date;
1212
updatedAt: Date;
13-
rootFolder: Folder;
13+
rootFolder: Folder | null;
1414
totalSpace: number;
1515
usedSpace: number;
1616
_id?: string;

0 commit comments

Comments
 (0)