Skip to content

Commit 8cedb67

Browse files
lauraaforlauraafor
committed
Merge remote-tracking branch 'origin/dev' into laura
2 parents 7a2c00b + 6602095 commit 8cedb67

Some content is hidden

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

57 files changed

+3135
-129
lines changed

‎.VSCodeCounter/2023-12-11_11-30-24/details.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Details
2+
3+
Date : 2023-12-11 11:30:24
4+
5+
Directory /Users/rose/Desktop/immersive/ReacType/server
6+
7+
Total : 19 files, 1362 codes, 341 comments, 210 blanks, all 1913 lines
8+
9+
[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md)
10+
11+
## Files
12+
| filename | language | code | comment | blank | total |
13+
| :--- | :--- | ---: | ---: | ---: | ---: |
14+
| [server/README.md](/server/README.md) | Markdown | 16 | 0 | 7 | 23 |
15+
| [server/assets/renderDemo.css](/server/assets/renderDemo.css) | CSS | 169 | 0 | 10 | 179 |
16+
| [server/controllers/cookieController.ts](/server/controllers/cookieController.ts) | TypeScript | 23 | 3 | 10 | 36 |
17+
| [server/controllers/marketplaceController.ts](/server/controllers/marketplaceController.ts) | TypeScript | 113 | 29 | 11 | 153 |
18+
| [server/controllers/projectController.ts](/server/controllers/projectController.ts) | TypeScript | 68 | 28 | 7 | 103 |
19+
| [server/controllers/sessionController.ts](/server/controllers/sessionController.ts) | TypeScript | 82 | 115 | 8 | 205 |
20+
| [server/controllers/userController.ts](/server/controllers/userController.ts) | TypeScript | 127 | 13 | 9 | 149 |
21+
| [server/controllers/userStylesController.ts](/server/controllers/userStylesController.ts) | TypeScript | 18 | 1 | 3 | 22 |
22+
| [server/graphQL/resolvers/mutation.ts](/server/graphQL/resolvers/mutation.ts) | TypeScript | 143 | 13 | 22 | 178 |
23+
| [server/graphQL/resolvers/query.ts](/server/graphQL/resolvers/query.ts) | TypeScript | 57 | 10 | 8 | 75 |
24+
| [server/graphQL/schema/typeDefs.ts](/server/graphQL/schema/typeDefs.ts) | TypeScript | 31 | 8 | 8 | 47 |
25+
| [server/interfaces.ts](/server/interfaces.ts) | TypeScript | 47 | 3 | 10 | 60 |
26+
| [server/models/Oauth-model.ts](/server/models/Oauth-model.ts) | TypeScript | 13 | 0 | 6 | 19 |
27+
| [server/models/reactypeModels.ts](/server/models/reactypeModels.ts) | TypeScript | 76 | 19 | 11 | 106 |
28+
| [server/routers/auth.ts](/server/routers/auth.ts) | TypeScript | 66 | 1 | 13 | 80 |
29+
| [server/routers/passport-setup.ts](/server/routers/passport-setup.ts) | TypeScript | 90 | 0 | 7 | 97 |
30+
| [server/routers/stylesRouter.ts](/server/routers/stylesRouter.ts) | TypeScript | 7 | 1 | 2 | 10 |
31+
| [server/server.ts](/server/server.ts) | TypeScript | 201 | 93 | 56 | 350 |
32+
| [server/tsconfig.json](/server/tsconfig.json) | JSON with Comments | 15 | 4 | 2 | 21 |
33+
34+
[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md)

‎.VSCodeCounter/2023-12-11_11-30-24/diff-details.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Diff Details
2+
3+
Date : 2023-12-11 11:30:24
4+
5+
Directory /Users/rose/Desktop/immersive/ReacType/server
6+
7+
Total : 0 files, 0 codes, 0 comments, 0 blanks, all 0 lines
8+
9+
[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details
10+
11+
## Files
12+
| filename | language | code | comment | blank | total |
13+
| :--- | :--- | ---: | ---: | ---: | ---: |
14+
15+
[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details

‎.VSCodeCounter/2023-12-11_11-30-24/diff.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"filename", "language", "", "comment", "blank", "total"
2+
"Total", "-", , 0, 0, 0

‎.VSCodeCounter/2023-12-11_11-30-24/diff.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Diff Summary
2+
3+
Date : 2023-12-11 11:30:24
4+
5+
Directory /Users/rose/Desktop/immersive/ReacType/server
6+
7+
Total : 0 files, 0 codes, 0 comments, 0 blanks, all 0 lines
8+
9+
[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md)
10+
11+
## Languages
12+
| language | files | code | comment | blank | total |
13+
| :--- | ---: | ---: | ---: | ---: | ---: |
14+
15+
## Directories
16+
| path | files | code | comment | blank | total |
17+
| :--- | ---: | ---: | ---: | ---: | ---: |
18+
19+
[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md)

‎.VSCodeCounter/2023-12-11_11-30-24/diff.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Date : 2023-12-11 11:30:24
2+
Directory : /Users/rose/Desktop/immersive/ReacType/server
3+
Total : 0 files, 0 codes, 0 comments, 0 blanks, all 0 lines
4+
5+
Languages
6+
+----------+------------+------------+------------+------------+------------+
7+
| language | files | code | comment | blank | total |
8+
+----------+------------+------------+------------+------------+------------+
9+
+----------+------------+------------+------------+------------+------------+
10+
11+
Directories
12+
+------+------------+------------+------------+------------+------------+
13+
| path | files | code | comment | blank | total |
14+
+------+------------+------------+------------+------------+------------+
15+
+------+------------+------------+------------+------------+------------+
16+
17+
Files
18+
+----------+----------+------------+------------+------------+------------+
19+
| filename | language | code | comment | blank | total |
20+
+----------+----------+------------+------------+------------+------------+
21+
| Total | | 0 | 0 | 0 | 0 |
22+
+----------+----------+------------+------------+------------+------------+

‎.VSCodeCounter/2023-12-11_11-30-24/results.csv

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
"filename", "language", "TypeScript", "CSS", "JSON with Comments", "Markdown", "comment", "blank", "total"
2+
"/Users/rose/Desktop/immersive/ReacType/server/README.md", "Markdown", 0, 0, 0, 16, 0, 7, 23
3+
"/Users/rose/Desktop/immersive/ReacType/server/assets/renderDemo.css", "CSS", 0, 169, 0, 0, 0, 10, 179
4+
"/Users/rose/Desktop/immersive/ReacType/server/controllers/cookieController.ts", "TypeScript", 23, 0, 0, 0, 3, 10, 36
5+
"/Users/rose/Desktop/immersive/ReacType/server/controllers/marketplaceController.ts", "TypeScript", 113, 0, 0, 0, 29, 11, 153
6+
"/Users/rose/Desktop/immersive/ReacType/server/controllers/projectController.ts", "TypeScript", 68, 0, 0, 0, 28, 7, 103
7+
"/Users/rose/Desktop/immersive/ReacType/server/controllers/sessionController.ts", "TypeScript", 82, 0, 0, 0, 115, 8, 205
8+
"/Users/rose/Desktop/immersive/ReacType/server/controllers/userController.ts", "TypeScript", 127, 0, 0, 0, 13, 9, 149
9+
"/Users/rose/Desktop/immersive/ReacType/server/controllers/userStylesController.ts", "TypeScript", 18, 0, 0, 0, 1, 3, 22
10+
"/Users/rose/Desktop/immersive/ReacType/server/graphQL/resolvers/mutation.ts", "TypeScript", 143, 0, 0, 0, 13, 22, 178
11+
"/Users/rose/Desktop/immersive/ReacType/server/graphQL/resolvers/query.ts", "TypeScript", 57, 0, 0, 0, 10, 8, 75
12+
"/Users/rose/Desktop/immersive/ReacType/server/graphQL/schema/typeDefs.ts", "TypeScript", 31, 0, 0, 0, 8, 8, 47
13+
"/Users/rose/Desktop/immersive/ReacType/server/interfaces.ts", "TypeScript", 47, 0, 0, 0, 3, 10, 60
14+
"/Users/rose/Desktop/immersive/ReacType/server/models/Oauth-model.ts", "TypeScript", 13, 0, 0, 0, 0, 6, 19
15+
"/Users/rose/Desktop/immersive/ReacType/server/models/reactypeModels.ts", "TypeScript", 76, 0, 0, 0, 19, 11, 106
16+
"/Users/rose/Desktop/immersive/ReacType/server/routers/auth.ts", "TypeScript", 66, 0, 0, 0, 1, 13, 80
17+
"/Users/rose/Desktop/immersive/ReacType/server/routers/passport-setup.ts", "TypeScript", 90, 0, 0, 0, 0, 7, 97
18+
"/Users/rose/Desktop/immersive/ReacType/server/routers/stylesRouter.ts", "TypeScript", 7, 0, 0, 0, 1, 2, 10
19+
"/Users/rose/Desktop/immersive/ReacType/server/server.ts", "TypeScript", 201, 0, 0, 0, 93, 56, 350
20+
"/Users/rose/Desktop/immersive/ReacType/server/tsconfig.json", "JSON with Comments", 0, 0, 15, 0, 4, 2, 21
21+
"Total", "-", 1162, 169, 15, 16, 341, 210, 1913

‎.VSCodeCounter/2023-12-11_11-30-24/results.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"file:///Users/rose/Desktop/immersive/ReacType/server/interfaces.ts":{"language":"TypeScript","code":47,"comment":3,"blank":10},"file:///Users/rose/Desktop/immersive/ReacType/server/assets/renderDemo.css":{"language":"CSS","code":169,"comment":0,"blank":10},"file:///Users/rose/Desktop/immersive/ReacType/server/controllers/marketplaceController.ts":{"language":"TypeScript","code":113,"comment":29,"blank":11},"file:///Users/rose/Desktop/immersive/ReacType/server/controllers/userStylesController.ts":{"language":"TypeScript","code":18,"comment":1,"blank":3},"file:///Users/rose/Desktop/immersive/ReacType/server/server.ts":{"language":"TypeScript","code":201,"comment":93,"blank":56},"file:///Users/rose/Desktop/immersive/ReacType/server/controllers/projectController.ts":{"language":"TypeScript","code":68,"comment":28,"blank":7},"file:///Users/rose/Desktop/immersive/ReacType/server/controllers/sessionController.ts":{"language":"TypeScript","code":82,"comment":115,"blank":8},"file:///Users/rose/Desktop/immersive/ReacType/server/controllers/cookieController.ts":{"language":"TypeScript","code":23,"comment":3,"blank":10},"file:///Users/rose/Desktop/immersive/ReacType/server/controllers/userController.ts":{"language":"TypeScript","code":127,"comment":13,"blank":9},"file:///Users/rose/Desktop/immersive/ReacType/server/tsconfig.json":{"language":"JSON with Comments","code":15,"comment":4,"blank":2},"file:///Users/rose/Desktop/immersive/ReacType/server/graphQL/resolvers/query.ts":{"language":"TypeScript","code":57,"comment":10,"blank":8},"file:///Users/rose/Desktop/immersive/ReacType/server/graphQL/schema/typeDefs.ts":{"language":"TypeScript","code":31,"comment":8,"blank":8},"file:///Users/rose/Desktop/immersive/ReacType/server/graphQL/resolvers/mutation.ts":{"language":"TypeScript","code":143,"comment":13,"blank":22},"file:///Users/rose/Desktop/immersive/ReacType/server/models/Oauth-model.ts":{"language":"TypeScript","code":13,"comment":0,"blank":6},"file:///Users/rose/Desktop/immersive/ReacType/server/README.md":{"language":"Markdown","code":16,"comment":0,"blank":7},"file:///Users/rose/Desktop/immersive/ReacType/server/models/reactypeModels.ts":{"language":"TypeScript","code":76,"comment":19,"blank":11},"file:///Users/rose/Desktop/immersive/ReacType/server/routers/passport-setup.ts":{"language":"TypeScript","code":90,"comment":0,"blank":7},"file:///Users/rose/Desktop/immersive/ReacType/server/routers/stylesRouter.ts":{"language":"TypeScript","code":7,"comment":1,"blank":2},"file:///Users/rose/Desktop/immersive/ReacType/server/routers/auth.ts":{"language":"TypeScript","code":66,"comment":1,"blank":13}}

‎.VSCodeCounter/2023-12-11_11-30-24/results.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Summary
2+
3+
Date : 2023-12-11 11:30:24
4+
5+
Directory /Users/rose/Desktop/immersive/ReacType/server
6+
7+
Total : 19 files, 1362 codes, 341 comments, 210 blanks, all 1913 lines
8+
9+
Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md)
10+
11+
## Languages
12+
| language | files | code | comment | blank | total |
13+
| :--- | ---: | ---: | ---: | ---: | ---: |
14+
| TypeScript | 16 | 1,162 | 337 | 191 | 1,690 |
15+
| CSS | 1 | 169 | 0 | 10 | 179 |
16+
| Markdown | 1 | 16 | 0 | 7 | 23 |
17+
| JSON with Comments | 1 | 15 | 4 | 2 | 21 |
18+
19+
## Directories
20+
| path | files | code | comment | blank | total |
21+
| :--- | ---: | ---: | ---: | ---: | ---: |
22+
| . | 19 | 1,362 | 341 | 210 | 1,913 |
23+
| . (Files) | 4 | 279 | 100 | 75 | 454 |
24+
| assets | 1 | 169 | 0 | 10 | 179 |
25+
| controllers | 6 | 431 | 189 | 48 | 668 |
26+
| graphQL | 3 | 231 | 31 | 38 | 300 |
27+
| graphQL/resolvers | 2 | 200 | 23 | 30 | 253 |
28+
| graphQL/schema | 1 | 31 | 8 | 8 | 47 |
29+
| models | 2 | 89 | 19 | 17 | 125 |
30+
| routers | 3 | 163 | 2 | 22 | 187 |
31+
32+
Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md)

‎.VSCodeCounter/2023-12-11_11-30-24/results.txt

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
Date : 2023-12-11 11:30:24
2+
Directory : /Users/rose/Desktop/immersive/ReacType/server
3+
Total : 19 files, 1362 codes, 341 comments, 210 blanks, all 1913 lines
4+
5+
Languages
6+
+--------------------+------------+------------+------------+------------+------------+
7+
| language | files | code | comment | blank | total |
8+
+--------------------+------------+------------+------------+------------+------------+
9+
| TypeScript | 16 | 1,162 | 337 | 191 | 1,690 |
10+
| CSS | 1 | 169 | 0 | 10 | 179 |
11+
| Markdown | 1 | 16 | 0 | 7 | 23 |
12+
| JSON with Comments | 1 | 15 | 4 | 2 | 21 |
13+
+--------------------+------------+------------+------------+------------+------------+
14+
15+
Directories
16+
+------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+
17+
| path | files | code | comment | blank | total |
18+
+------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+
19+
| . | 19 | 1,362 | 341 | 210 | 1,913 |
20+
| . (Files) | 4 | 279 | 100 | 75 | 454 |
21+
| assets | 1 | 169 | 0 | 10 | 179 |
22+
| controllers | 6 | 431 | 189 | 48 | 668 |
23+
| graphQL | 3 | 231 | 31 | 38 | 300 |
24+
| graphQL/resolvers | 2 | 200 | 23 | 30 | 253 |
25+
| graphQL/schema | 1 | 31 | 8 | 8 | 47 |
26+
| models | 2 | 89 | 19 | 17 | 125 |
27+
| routers | 3 | 163 | 2 | 22 | 187 |
28+
+------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+
29+
30+
Files
31+
+------------------------------------------------------------------------------------+--------------------+------------+------------+------------+------------+
32+
| filename | language | code | comment | blank | total |
33+
+------------------------------------------------------------------------------------+--------------------+------------+------------+------------+------------+
34+
| /Users/rose/Desktop/immersive/ReacType/server/README.md | Markdown | 16 | 0 | 7 | 23 |
35+
| /Users/rose/Desktop/immersive/ReacType/server/assets/renderDemo.css | CSS | 169 | 0 | 10 | 179 |
36+
| /Users/rose/Desktop/immersive/ReacType/server/controllers/cookieController.ts | TypeScript | 23 | 3 | 10 | 36 |
37+
| /Users/rose/Desktop/immersive/ReacType/server/controllers/marketplaceController.ts | TypeScript | 113 | 29 | 11 | 153 |
38+
| /Users/rose/Desktop/immersive/ReacType/server/controllers/projectController.ts | TypeScript | 68 | 28 | 7 | 103 |
39+
| /Users/rose/Desktop/immersive/ReacType/server/controllers/sessionController.ts | TypeScript | 82 | 115 | 8 | 205 |
40+
| /Users/rose/Desktop/immersive/ReacType/server/controllers/userController.ts | TypeScript | 127 | 13 | 9 | 149 |
41+
| /Users/rose/Desktop/immersive/ReacType/server/controllers/userStylesController.ts | TypeScript | 18 | 1 | 3 | 22 |
42+
| /Users/rose/Desktop/immersive/ReacType/server/graphQL/resolvers/mutation.ts | TypeScript | 143 | 13 | 22 | 178 |
43+
| /Users/rose/Desktop/immersive/ReacType/server/graphQL/resolvers/query.ts | TypeScript | 57 | 10 | 8 | 75 |
44+
| /Users/rose/Desktop/immersive/ReacType/server/graphQL/schema/typeDefs.ts | TypeScript | 31 | 8 | 8 | 47 |
45+
| /Users/rose/Desktop/immersive/ReacType/server/interfaces.ts | TypeScript | 47 | 3 | 10 | 60 |
46+
| /Users/rose/Desktop/immersive/ReacType/server/models/Oauth-model.ts | TypeScript | 13 | 0 | 6 | 19 |
47+
| /Users/rose/Desktop/immersive/ReacType/server/models/reactypeModels.ts | TypeScript | 76 | 19 | 11 | 106 |
48+
| /Users/rose/Desktop/immersive/ReacType/server/routers/auth.ts | TypeScript | 66 | 1 | 13 | 80 |
49+
| /Users/rose/Desktop/immersive/ReacType/server/routers/passport-setup.ts | TypeScript | 90 | 0 | 7 | 97 |
50+
| /Users/rose/Desktop/immersive/ReacType/server/routers/stylesRouter.ts | TypeScript | 7 | 1 | 2 | 10 |
51+
| /Users/rose/Desktop/immersive/ReacType/server/server.ts | TypeScript | 201 | 93 | 56 | 350 |
52+
| /Users/rose/Desktop/immersive/ReacType/server/tsconfig.json | JSON with Comments | 15 | 4 | 2 | 21 |
53+
| Total | | 1,362 | 341 | 210 | 1,913 |
54+
+------------------------------------------------------------------------------------+--------------------+------------+------------+------------+------------+

‎.VSCodeCounter/2023-12-11_11-31-28/details.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Details
2+
3+
Date : 2023-12-11 11:31:28
4+
5+
Directory /Users/rose/Desktop/immersive/ReacType/__tests__
6+
7+
Total : 16 files, 2004 codes, 390 comments, 292 blanks, all 2686 lines
8+
9+
[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md)
10+
11+
## Files
12+
| filename | language | code | comment | blank | total |
13+
| :--- | :--- | ---: | ---: | ---: | ---: |
14+
| [__tests__/BottomTabs.test.tsx](/__tests__/BottomTabs.test.tsx) | TypeScript JSX | 207 | 3 | 24 | 234 |
15+
| [__tests__/DragAndDrop.test.tsx](/__tests__/DragAndDrop.test.tsx) | TypeScript JSX | 69 | 0 | 9 | 78 |
16+
| [__tests__/NavBar.test.tsx](/__tests__/NavBar.test.tsx) | TypeScript JSX | 222 | 18 | 55 | 295 |
17+
| [__tests__/componentReducer.test.ts](/__tests__/componentReducer.test.ts) | TypeScript | 243 | 36 | 20 | 299 |
18+
| [__tests__/contextReducer.test.js](/__tests__/contextReducer.test.js) | JavaScript | 140 | 25 | 31 | 196 |
19+
| [__tests__/gql.projects.test.ts](/__tests__/gql.projects.test.ts) | TypeScript | 122 | 16 | 6 | 144 |
20+
| [__tests__/helper.test.tsx](/__tests__/helper.test.tsx) | TypeScript JSX | 6 | 0 | 2 | 8 |
21+
| [__tests__/marketplace.test.tsx](/__tests__/marketplace.test.tsx) | TypeScript JSX | 111 | 3 | 20 | 134 |
22+
| [__tests__/playwright/example.spec.ts](/__tests__/playwright/example.spec.ts) | TypeScript | 0 | 13 | 6 | 19 |
23+
| [__tests__/projects.test.ts](/__tests__/projects.test.ts) | TypeScript | 60 | 9 | 3 | 72 |
24+
| [__tests__/server.test.tsx](/__tests__/server.test.tsx) | TypeScript JSX | 320 | 58 | 57 | 435 |
25+
| [__tests__/signIn.test.tsx](/__tests__/signIn.test.tsx) | TypeScript JSX | 49 | 0 | 3 | 52 |
26+
| [__tests__/spec.ts](/__tests__/spec.ts) | TypeScript | 1 | 26 | 6 | 33 |
27+
| [__tests__/stateManagementReducer.test.js](/__tests__/stateManagementReducer.test.js) | JavaScript | 267 | 20 | 23 | 310 |
28+
| [__tests__/tree.test.tsx](/__tests__/tree.test.tsx) | TypeScript JSX | 108 | 3 | 3 | 114 |
29+
| [__tests__/userAuth.test.ts](/__tests__/userAuth.test.ts) | TypeScript | 79 | 160 | 24 | 263 |
30+
31+
[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md)

0 commit comments

Comments
 (0)