Skip to content

Commit

Permalink
Merge branch 'release-0.2.49'
Browse files Browse the repository at this point in the history
  • Loading branch information
entrotech committed Feb 5, 2024
2 parents 0c0931e + c099072 commit 03f20e1
Show file tree
Hide file tree
Showing 260 changed files with 48,259 additions and 48,498 deletions.
37 changes: 37 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
Fixes #replace_this_text_with_the_issue_number

### What changes did you make?

-
-
-

### Why did you make the changes (we will use this info to test)?

-
-
-

### Issue-Specific User Account

If you registered a new, temporary TDM User Account for this issue, indicate the
username (i.e., email address) for the account.

### Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)

<!-- Note, if your images are too big, use the <img src="" width="" length="" /> syntax instead of ![image](link) to format the images -->
<!-- If images are not loading properly, you might need to double check the syntax or add a newline after the closing </summary> tag -->

<details>
<summary>Visuals before changes are applied</summary>

![image](Paste_Your_Image_Link_Here_After_Attaching_Files)

</details>

<details>
<summary>Visuals after changes are applied</summary>

![image](Paste_Your_Image_Link_Here_After_Attaching_Files)

</details>
4 changes: 2 additions & 2 deletions .github/workflows/new-issue-create-card.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Create or Update Project Card
uses: peter-evans/create-or-update-project-card@v1
uses: peter-evans/create-or-update-project-card@v2
with:
project-name: Project Management
project-name: Product Management
column-name: New Issue Approval
30 changes: 30 additions & 0 deletions .github/workflows/tdm-server-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: tdm-server-test
run-name: ${{ github.actor }} is running tests for the server
on:
push:
pull_request:
branches:
- develop
jobs:
server-test:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 'lts/*'

- name: Change directory
run: cd server

- name: Install dependencies
run: npm install
working-directory: server

- name: Run tests
run: npm test
working-directory: server
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -260,3 +260,5 @@ dotenv
yarn.lock

.mssql.json
server/.env-ale
server/.env-alpha
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.formatOnPaste": true
"editor.formatOnPaste": true,
"files.eol": "\n"
}
28 changes: 13 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,9 @@ The city will benefit by having more time to review edge cases for building deve
- Web API Server Library: [Express](https://expressjs.com/)
- Client JavaScript Library: [React](https://reactjs.org/)
- Scaffolding for Client Application: [Create React App](https://facebook.github.io/create-react-app/docs/getting-started)
- Visual Component Library: [Storybook](https://storybook.js.org/) / [Tutorial](https://www.learnstorybook.com/react/en/get-started) - The first three sections are enough to get you started.
- JavaScript Unit Test Framework: [Jest](https://jestjs.io/)
- Database Engine: [Microsoft SQL Server](http://www.sqlservertutorial.net/) / [Tutorial](http://www.sqlservertutorial.net/)

## Feature Descriptions

- [register](/docs/register.md)
- [forgot-password](/docs/forgot-password.md)

## How to Contribute

- Join the team on the Hack For LA Slack channel (#tdm-calculator), or at our weekly hack night on Tuesdays in [Hack For LA](https://www.hackforla.org/)!
Expand All @@ -51,28 +45,32 @@ The city will benefit by having more time to review edge cases for building deve

### Working with issues

- To submit a bug.

Go to Project Kanban board by clicking on "Projects" tab. Create a note in Ice Box by clicking on the "+" sign. Write a general bug description and add the note. During weekly meetings in Hack For LA, we'll review the Ice Box and convert cards to Prioritized Backlog.
Access the [Issues tab](https://github.com/hackforla/tdm-calculator/issues) and click "New Issue", use the blank issue template and fill out the Issue Detail:

- Explain how to submit a feature request.
Title: Enter a concise, descriptive title for your issue.
Comment: Provide a detailed description of the issue, including what you expected to happen and what actually happened.

- Explain how to contribute to an existing issue.
Assignees: You can assign the issue to a specific person if needed.
Labels: You can add labels to categorize the issue (e.g., bug, enhancement, feature request).
Milestone: Assign the issue to a milestone if it's part of a larger project or goal.
Preview and Submit
Confirm.

To create a new issue, please use the blank issue template (available when you click New Issue). If you want to create an issue for other projects to use, please create the issue in your own repository and send a slack message to one of your hack night hosts with the link.
Then go to the [projects Kanabn](https://github.com/hackforla/tdm-calculator/projects/1) you will see your new issue under
'New Issue Approval' column. After being discussed in the first upcoming team meeting, PMs can move it to the prioritized backlog or 'In Progress,' depending on its status. If it's dependent on other issues that are not resolved, it will be moved to the 'Icebox.

## Contact info

Please use the tdm-calculator slack channel to communicate with the whole project team, or direct-messages through slack for communication with individuals.
Please use the tdm-calculator slack channel to communicate with the whole project team.

If you have any questions or comments, feel free to reach out to:
Hack For LA
Bonnie
Co-Host/Organizer
bonnie@hackforla.org
tdm@hackforla.org

### Licensing

Include details about the project's open source status.
https://github.com/hackforla/tdm-calculator/blob/develop/LICENSE

_this readme file sourced from [Jessica Sand](http://jessicasand.com/other-stuff/just-enough-docs/)_
3 changes: 3 additions & 0 deletions client/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"no-alert": "error"
},
"settings": {
"jest": {
"version": "27.5.1"
},
// Settings for eslint-plugin-react
"react": {
"createClass": "createReactClass",
Expand Down
1 change: 1 addition & 0 deletions client/.prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
module.exports = {
trailingComma: "none", // deafult changed in prettier 2+
arrowParens: "avoid", // default changed in prettier 2+
endOfLine: "auto"
};
Loading

0 comments on commit 03f20e1

Please sign in to comment.