Skip to content

Commit

Permalink
Merge branch 'release-1.0.67'
Browse files Browse the repository at this point in the history
  • Loading branch information
entrotech committed Jun 10, 2022
2 parents d1995c5 + b8b6c30 commit 6268d0e
Show file tree
Hide file tree
Showing 43 changed files with 29,264 additions and 23,992 deletions.
41 changes: 41 additions & 0 deletions .github/ISSUE_TEMPLATE/a---bug report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
(This form helps the reporter give enough information so that product managers, designers/researchers, and programmers can evaluate the issue, prioritize it, and resolve it.)

#### Describe the bug

A clear and concise description of what the bug is, who it affects, how it affects users.

What is the user’s goal?


#### Steps to reproduce the issue

(if applicable, please specify platform (iOS, Android, Windows, Mac version) and brower)

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error


#### What's the expected result?

-

(if you have a suggested solution, you can add it here)

#### What's the actual result?

-


#### Additional details / screenshot

- Screenshot (drag in)
- Video recording (drag in)

#### Device configuration
- Device: [e.g. type of smartphone, tablet, desktop computer]
- OS version: [e.g. iOS, Android version #]
- Browser [e.g. Chrome, Firefox, Safari, etc.]
- Browser version [e.g. 22]
-
47 changes: 47 additions & 0 deletions .github/ISSUE_TEMPLATE/a---bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
---
name: A - Bug report
about: Create a report to help us improve
title: 'Bug: '
labels: ''
assignees: ''

---

#### Describe the bug

A clear and concise description of what the bug is, who it affects, how it affects users.

(optional) What is the user’s goal?


#### Steps to reproduce the issue

(if applicable, please specify platform (iOS, Android, Windows, Mac version) and brower)

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error


#### What's the expected result?

-

(if you have a suggested solution, you can add it here)

#### What's the actual result?

-


#### Additional details / screenshot

- Screenshot (drag in)
- Video recording (drag in)

#### Device configuration
- Device: [e.g. type of smartphone, tablet, desktop computer]
- OS version: [e.g. iOS, Android version #]
- Browser [e.g. Chrome, Firefox, Safari, etc.]
- Browser version [e.g. 22]
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/b---update-team-roster.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: B - Update Team Roster
about: Provides new team members a link to team roster to input their information
title: ''
labels: documentation, good first issue, question
labels: good first issue
assignees: ''

---
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/c---create-agenda.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: C - Create Agenda
about: Assign issue to all team members day after meetup in prep for next meetup
title: ''
labels: documentation, help wanted, question
labels: help wanted
assignees: ''

---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: C - Update Content for ReadMe file
about: Instructions for revising the README.md file inside this repository
title: ''
labels: documentation, good first issue, help wanted, question
labels: good first issue, help wanted
assignees: ''

---
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/create-agenda.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Create Agenda
about: Assign issue to all team members day after meetup in prep for next meetup
title: ''
labels: documentation, help wanted, question
labels: help wanted
assignees: ''

---
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-content-for-readme-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Update Content for ReadMe file
about: Instructions for revising the README.md file inside this repository
title: ''
labels: documentation, good first issue, help wanted, question
labels: good first issue, help wanted
assignees: ''

---
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-team-roster.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: 2 - Update Team Roster
about: Provides new team members a link to team roster to input their information
title: ''
labels: documentation, good first issue, question
labels: good first issue
assignees: ''

---
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN mkdir /app
WORKDIR /app
COPY client/package.json .
COPY client/package-lock.json .
RUN npm ci
RUN npm ci --legacy-peer-deps
COPY client .

RUN npm run build
Expand Down Expand Up @@ -36,6 +36,6 @@ COPY --from=clientBuilder /app/build ./client/build
RUN groupadd -r fola && useradd --no-log-init -r -g fola fola
USER fola

EXPOSE 5000
EXPOSE 5001

ENTRYPOINT ["/usr/local/bin/node", "server.js"]
2 changes: 1 addition & 1 deletion Dockerfile-jared
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY ./server/entrypoint.sh ./
RUN groupadd -r fola && useradd --no-log-init -r -g fola fola
USER fola

EXPOSE 5000
EXPOSE 5001

ENTRYPOINT ["./entrypoint.sh"]
CMD ["node", "server.js"]
3 changes: 2 additions & 1 deletion client/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
REACT_APP_TENANT_ID=1
REACT_APP_MAPBOX_ACCESS_TOKEN=pk.eyJ1IjoibHVjYXNob21lciIsImEiOiJjazFqcnRjcm0wNmZ1M2JwZXg2eDFzMXd3In0.yYpkKLrFCxF-qyBfZH1a8w
REACT_APP_TAMU_GEOSERVICES_API_KEY=5c141ed805794a7a9562c22c090a71cb
REACT_APP_TAMU_GEOSERVICES_API_KEY=5c141ed805794a7a9562c22c090a71cb
SKIP_PREFLIGHT_CHECK=true
Loading

0 comments on commit 6268d0e

Please sign in to comment.