Skip to content

Commit

Permalink
Merge pull request #353 from DTS-STN/develop
Browse files Browse the repository at this point in the history
Release 2022-07-19
  • Loading branch information
JeremyKennedy authored Jul 19, 2022
2 parents a37ae7e + 90c4c92 commit d315ea2
Show file tree
Hide file tree
Showing 154 changed files with 3,048 additions and 3,871 deletions.
7 changes: 3 additions & 4 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ However, while we removed the frontend's usage of the API, it is still fully fun
- [TypeScript](https://www.typescriptlang.org/)
- [React](https://reactjs.org/): UI framework
- [React testing library](https://testing-library.com/docs/react-testing-library/intro/): React component testing
- [Mobx state tree](https://mobx-state-tree.js.org/intro/welcome): React state management
- [Tailwind CSS](https://tailwindcss.com/)
- [Jest](https://jestjs.io/): Unit testing
- [Yarn](https://yarnpkg.com/): Package manager (note this is Yarn v2, and not the classic v1)
Expand All @@ -64,16 +63,16 @@ Top of a set of fields there is also the concept of child form fields. This is e

#### Technology

Because of React's form issues, `mobx-state-tree` and `mobx-react` were used to only re-render when necessary and to control the current state of user inputted data what component's are currently rendered on screen.
~~Because of React's form issues, `mobx-state-tree` and `mobx-react` were used to only re-render when necessary and to control the current state of user inputted data what component's are currently rendered on screen.~~

You may come across `observer` components, which will observe to the mobx data in the form and only re-render a component if it needs to instead of React's default re-rendering scheme where the parent and all children are automatically re-rendered.
~~You may come across `observer` components, which will observe to the mobx data in the form and only re-render a component if it needs to instead of React's default re-rendering scheme where the parent and all children are automatically re-rendered.~~

#### File Structure

Below you'll find the file structure as it pertains to the front end.

- `/pages` - Next.js pages, including the API. The structure here determines routing.
- `/client-state` - state management lives here, all mobx tree node files
- `/client-state` - state management lives here
- `/components` - where all the react components live
- `/public` - any asset or file that needs to be accessible by the application must go here
- `/styles`
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/dynamic-site-name.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This workflow will add a comment to the PR with the development or dynamic site

name: Comment environment in PR

on:
pull_request:
branches:
- develop

jobs:
comment_environment:
runs-on: ubuntu-latest
steps:
- name: Checkout 🔔
uses: actions/checkout@v3

- name: Comment PR
uses: thollander/actions-comment-pull-request@v1

with:
message: "Dynamic branch URL: https://eligibility-estimator-dyna-${{ github.head_ref }}.bdm-dev.dts-stn.com"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn dlx --quiet lint-staged
yarn dlx --quiet lint-staged --concurrent false
2 changes: 0 additions & 2 deletions .idea/eligibility-estimator.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

569 changes: 456 additions & 113 deletions .pnp.cjs

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@ node_modules/
.next/
.yarn/
coverage/
helmfile/
helm/
out/
yarn.lock
.pnp.cjs
.pnp.loader.mjs

# unsupported syntax
helmfile/
helm/
#helmfile/helmfile.yaml
#helm/charts/next-template/templates/service.yaml
#helm/charts/next-template/templates/ingress.yaml
#helm/charts/next-template/templates/deployment.yaml
2 changes: 1 addition & 1 deletion .teamcity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ In order to deploy with TeamCity, two approaches can be taken.
1. You can configure everything from the TC UI, however, it is easier but not recommended compared to the second option.
2. Taking the Configuration as Code approach allows developers to edit the deployment configurations from teh code. Thus enabling programmers to create Pull Requests for reviews. In addition, configuration as code enables more flexibility.

The files in the current folder `.teamcity` are an example of what it would look like for an application called single-tier-application.
The files in the current folder `.teamcity` are an example of what it would look like for an application called EligibilityEstimator.
6 changes: 3 additions & 3 deletions .teamcity/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<project>
<modelVersion>4.0.0</modelVersion>
<name>Dev_single-tier-appliction Config DSL Script</name>
<groupId>Dev_single-tier-appliction</groupId>
<artifactId>Dev_single-tier-appliction_dsl</artifactId>
<name>Dev_EligibilityEstimator Config DSL Script</name>
<groupId>Dev_EligibilityEstimator</groupId>
<artifactId>Dev_EligibilityEstimator_dsl</artifactId>
<version>1.0-SNAPSHOT</version>

<parent>
Expand Down
Loading

1 comment on commit d315ea2

@vercel
Copy link

@vercel vercel bot commented on d315ea2 Jul 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.