Skip to content

Commit

Permalink
Merge branch 'task/FP-737--manage-allocations' into task/FP-737-final-UI
Browse files Browse the repository at this point in the history
  • Loading branch information
edmondsgarrett authored Jun 9, 2022
2 parents 5389319 + 37272ef commit 25a0cdd
Show file tree
Hide file tree
Showing 100 changed files with 23,003 additions and 13,416 deletions.
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The base Portal code for TACC WMA Workspace Portals
### Related Repositories:
- [Camino], a Docker container-based deployment scheme
- [Core CMS], the base CMS code for TACC WMA CMS Websites
- [Core Styles], the shared UI pattern code for TACC WMA CMS Websites
- [Core Portal Deployments], private repository that facilitates deployments of [Core Portal] images via [Camino] and Jenkins

# Local Development Setup
Expand Down Expand Up @@ -245,6 +246,21 @@ We use a modifed version of [GitFlow](https://datasift.github.io/gitflow/Introdu
- `bug/` for bugfixes
- `fix/` for hotfixes

#### Testing Core Styles Changes Locally

1. Clone [Core Styles] (if you haven't already).
2. Tell project to temporarily use your [Core Styles] clone:
```bash
npm link path-to/Core-Styles # e.g. npm link ../../Core-Styles
```

3. Make changes in your [Core Styles] clone as necessary.
4. Test changes.
- Changes to imported files during `npm run dev` will trigger livereload.
5. Commit successful changes to a [Core Styles] branch.

- _Note: [If you run `npm install` or `npm ci`, the link is destroyed.](https://github.com/npm/cli/issues/2380#issuecomment-1029967927) Repeat the above steps to restore it._

#### Best Practices
Sign your commits ([see this link](https://help.github.com/en/github/authenticating-to-github/managing-commit-signature-verification) for help)

Expand All @@ -260,5 +276,6 @@ Sign your commits ([see this link](https://help.github.com/en/github/authenticat
[Camino]: https://github.com/TACC/Camino
[Core CMS]: https://github.com/TACC/Core-CMS
[Core Portal]: https://github.com/TACC/Core-Portal
[Core Styles]: https://github.com/TACC/Core-Styles
[1]: https://docs.docker.com/get-docker/
[2]: https://docs.docker.com/compose/install/
9 changes: 9 additions & 0 deletions client/.postcssrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
plugins:

postcss-preset-env:
stage: false # to only allow features explicitely
features:
custom-media-queries: true
media-query-ranges: true

postcss-extend-rule: {}
5 changes: 5 additions & 0 deletions client/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# vendor
node_modules
# vendor: copied
icon.fonts.css

# auto-generated
coverage
build
dist
Loading

0 comments on commit 25a0cdd

Please sign in to comment.