Skip to content

Commit bad8788

Browse files
danthecmdanthecm
authored
Merge pull request #86 from BuildForSDG/ft-user-can-make-reports-and-view-all-results
Ft user can make reports and view all results
2 parents eb299da + 12a43c7 commit bad8788

11 files changed

Lines changed: 1825 additions & 158 deletions

File tree

‎.eslintrc.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ module.exports = {
1717
rules: {
1818
'comma-dangle': ['error', 'never'],
1919
'no-param-reassign': ['error', { props: false }],
20-
"comma-dangle": ["error", "never"],
21-
"no-param-reassign": ["error", { props: false }],
2220
"quotes": ["error", "double"]
2321
}
2422
};

‎.gitignore‎

Lines changed: 225 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,225 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
7-
8-
lerna-debug.log*
9-
10-
# Diagnostic reports (https://nodejs.org/api/report.html)
11-
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
12-
13-
# Runtime data
14-
pids
15-
*.pid
16-
*.seed
17-
*.pid.lock
18-
19-
# Directory for instrumented libs generated by jscoverage/JSCover
20-
lib-cov
21-
22-
# Coverage directory used by tools like istanbul
23-
coverage
24-
*.lcov
25-
26-
# nyc test coverage
27-
.nyc_output
28-
29-
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
30-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
31-
.grunt
32-
33-
# Bower dependency directory (https://bower.io/)
34-
bower_components
35-
36-
# node-waf configuration
37-
.lock-wscript
38-
39-
# Compiled binary addons (https://nodejs.org/api/addons.html)
40-
build/Release
41-
42-
# Dependency directories
43-
node_modules/
44-
jspm_packages/
45-
46-
# TypeScript v1 declaration files
47-
typings/
48-
49-
# TypeScript cache
50-
*.tsbuildinfo
51-
52-
# Typescript v1 declaration files
53-
typings/
54-
55-
# Optional npm cache directory
56-
.npm
57-
58-
# Optional eslint cache
59-
.eslintcache
60-
61-
# Microbundle cache
62-
.rpt2_cache/
63-
.rts2_cache_cjs/
64-
.rts2_cache_es/
65-
.rts2_cache_umd/
66-
67-
# Optional REPL history
68-
.node_repl_history
69-
70-
# Output of "npm pack"
71-
*.tgz
72-
73-
# Yarn Integrity file
74-
.yarn-integrity
75-
76-
# dotenv environment variables file
77-
.env
78-
.env.test
79-
80-
# parcel-bundler cache (https://parceljs.org/)
81-
.cache
82-
83-
# Next.js build output
84-
.next
85-
86-
# Nuxt.js build / generate output
87-
.nuxt
88-
dist
89-
90-
# Gatsby files
91-
.cache/
92-
# Comment in the public line in if your project uses Gatsby and *not* Next.js
93-
# https://nextjs.org/blog/next-9-1#public-directory-support
94-
# public
95-
96-
# vuepress build output
97-
.vuepress/dist
98-
99-
# Serverless directories
100-
.serverless/
101-
102-
# FuseBox cache
103-
.fusebox/
104-
105-
# DynamoDB Local files
106-
.dynamodb/
107-
108-
# TernJS port file
109-
.tern-port
110-
111-
# next.js build output
112-
.next
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
8+
lerna-debug.log*
9+
10+
# Diagnostic reports (https://nodejs.org/api/report.html)
11+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
12+
13+
# Runtime data
14+
pids
15+
*.pid
16+
*.seed
17+
*.pid.lock
18+
19+
# Directory for instrumented libs generated by jscoverage/JSCover
20+
lib-cov
21+
22+
# Coverage directory used by tools like istanbul
23+
coverage
24+
*.lcov
25+
26+
# nyc test coverage
27+
.nyc_output
28+
29+
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
30+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
31+
.grunt
32+
33+
# Bower dependency directory (https://bower.io/)
34+
bower_components
35+
36+
# node-waf configuration
37+
.lock-wscript
38+
39+
# Compiled binary addons (https://nodejs.org/api/addons.html)
40+
build/Release
41+
42+
# Dependency directories
43+
node_modules/
44+
jspm_packages/
45+
46+
# TypeScript v1 declaration files
47+
typings/
48+
49+
# TypeScript cache
50+
*.tsbuildinfo
51+
52+
# Typescript v1 declaration files
53+
typings/
54+
55+
# Optional npm cache directory
56+
.npm
57+
58+
# Optional eslint cache
59+
.eslintcache
60+
61+
# Microbundle cache
62+
.rpt2_cache/
63+
.rts2_cache_cjs/
64+
.rts2_cache_es/
65+
.rts2_cache_umd/
66+
67+
# Optional REPL history
68+
.node_repl_history
69+
70+
# Output of "npm pack"
71+
*.tgz
72+
73+
# Yarn Integrity file
74+
.yarn-integrity
75+
76+
# dotenv environment variables file
77+
.env
78+
.env.test
79+
80+
# parcel-bundler cache (https://parceljs.org/)
81+
.cache
82+
83+
# Next.js build output
84+
.next
85+
86+
# Nuxt.js build / generate output
87+
.nuxt
88+
dist
89+
90+
# Gatsby files
91+
.cache/
92+
# Comment in the public line in if your project uses Gatsby and *not* Next.js
93+
# https://nextjs.org/blog/next-9-1#public-directory-support
94+
# public
95+
96+
# vuepress build output
97+
.vuepress/dist
98+
99+
# Serverless directories
100+
.serverless/
101+
102+
# FuseBox cache
103+
.fusebox/
104+
105+
# DynamoDB Local files
106+
.dynamodb/
107+
108+
# TernJS port file
109+
.tern-port
110+
111+
# next.js build output
112+
.next
113+
# Logs
114+
logs
115+
*.log
116+
npm-debug.log*
117+
yarn-debug.log*
118+
yarn-error.log*
119+
120+
lerna-debug.log*
121+
122+
# Diagnostic reports (https://nodejs.org/api/report.html)
123+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
124+
125+
# Runtime data
126+
pids
127+
*.pid
128+
*.seed
129+
*.pid.lock
130+
131+
# Directory for instrumented libs generated by jscoverage/JSCover
132+
lib-cov
133+
134+
# Coverage directory used by tools like istanbul
135+
coverage
136+
*.lcov
137+
138+
# nyc test coverage
139+
.nyc_output
140+
141+
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
142+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
143+
.grunt
144+
145+
# Bower dependency directory (https://bower.io/)
146+
bower_components
147+
148+
# node-waf configuration
149+
.lock-wscript
150+
151+
# Compiled binary addons (https://nodejs.org/api/addons.html)
152+
build/Release
153+
154+
# Dependency directories
155+
node_modules/
156+
jspm_packages/
157+
158+
# TypeScript v1 declaration files
159+
typings/
160+
161+
# TypeScript cache
162+
*.tsbuildinfo
163+
164+
# Typescript v1 declaration files
165+
typings/
166+
167+
# Optional npm cache directory
168+
.npm
169+
170+
# Optional eslint cache
171+
.eslintcache
172+
173+
# Microbundle cache
174+
.rpt2_cache/
175+
.rts2_cache_cjs/
176+
.rts2_cache_es/
177+
.rts2_cache_umd/
178+
179+
# Optional REPL history
180+
.node_repl_history
181+
182+
# Output of "npm pack"
183+
*.tgz
184+
185+
# Yarn Integrity file
186+
.yarn-integrity
187+
188+
# dotenv environment variables file
189+
.env
190+
.env.test
191+
192+
# parcel-bundler cache (https://parceljs.org/)
193+
.cache
194+
195+
# Next.js build output
196+
.next
197+
198+
# Nuxt.js build / generate output
199+
.nuxt
200+
dist
201+
202+
# Gatsby files
203+
.cache/
204+
# Comment in the public line in if your project uses Gatsby and *not* Next.js
205+
# https://nextjs.org/blog/next-9-1#public-directory-support
206+
# public
207+
208+
# vuepress build output
209+
.vuepress/dist
210+
211+
# Serverless directories
212+
.serverless/
213+
214+
# FuseBox cache
215+
.fusebox/
216+
217+
# DynamoDB Local files
218+
.dynamodb/
219+
220+
# TernJS port file
221+
.tern-port
222+
223+
# next.js build output
224+
.next
225+
.vscode

‎.vscode/settings.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2+
<<<<<<< HEAD
3+
"deno.enable": false
4+
=======
25
"eslint.debug": true
6+
>>>>>>> eb299da8b68329cc308694ce8c1f46fba8812bc7
37
}

‎fasta-backend/.env.example‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DB_URI=
2+
PORT=
3+
TEST_KEY

‎fasta-backend/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ typings/
5959

6060
# next.js build output
6161
.next
62+
.vscode

‎fasta-backend/.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"deno.enable": false
3+
}

‎fasta-backend/api/_transporters-api.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,5 @@ GetTransporter.prototype.getPlaces = async () => {
4040
req.end();
4141
};
4242

43-
//
44-
4543

4644
module.exports = GetTransporter;

‎fasta-backend/models/report.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const reportSchema = new Schema({
77
type: { type: String },
88
description: { type: String },
99
location: { type: Object },
10+
address: { type: String },
1011
date: {
1112
type: Date,
1213
default: Date.now

0 commit comments

Comments
 (0)