Skip to content

Commit 52deb67

Browse files
authored
Merge pull request #27 from unity-sds/develop
Merge Develop to Main
2 parents f1ea627 + c38b6ec commit 52deb67

File tree

37 files changed

+1205
-319
lines changed

37 files changed

+1205
-319
lines changed

.dockerignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.git
2+
*/.git
3+
node_modules
4+
*/node_modules
5+
npm-debug.log
6+
dist
7+
.swc
8+
.env
9+
!.env/.env

.env/.env

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
1-
VITE_UNITY_UI_VERSION=${npm_package_version}
1+
# GENERAL
2+
VITE_UNITY_UI_VERSION=${npm_package_version}
3+
VITE_ADMIN_EMAIL=ENV_UNITY_UI_ADMIN_EMAIL
4+
5+
# Auth
6+
VITE_AUTH_OAUTH_CLIENT_ID=ENV_UNITY_UI_AUTH_OAUTH_CLIENT_ID
7+
VITE_AUTH_OAUTH_REDIRECT_URI=ENV_UNITY_UI_AUTH_OAUTH_REDIRECT_URI
8+
VITE_AUTH_OAUTH_LOGOUT_ENDPOINT=ENV_UNITY_UI_AUTH_OAUTH_LOGOUT_ENDPOINT
9+
VITE_AUTH_OAUTH_PROVIDER_URL=ENV_UNITY_UI_AUTH_OAUTH_PROVIDER_URL
10+
VITE_AUTH_APP_ADMIN_GROUP_NAME=ENV_UNITY_UI_AUTH_APP_ADMIN_GROUP_NAME
11+
VITE_AUTH_APP_APP_VIEWER_GROUP_NAME=ENV_UNITY_UI_AUTH_APP_APP_VIEWER_GROUP_NAME
12+
13+
# ADS
14+
VITE_ADS_URL=ENV_UNITY_UI_ADS_URL
15+
16+
# DS
17+
VITE_STAC_BROWSER_URL=ENV_UNITY_UI_STAC_BROWSER_URL
18+
19+
# SPS
20+
VITE_SPS_WPST_ENDPOINT=ENV_UNITY_UI_SPS_WPST_ENDPOINT

.env/.env.development

Lines changed: 0 additions & 18 deletions
This file was deleted.

.env/.env.docker.example

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# GENERAL
2+
ENV_UNITY_UI_ADMIN_EMAIL=REPLACE_WITH_ADMIN_EMAIL
3+
4+
# Auth
5+
ENV_UNITY_UI_AUTH_OAUTH_CLIENT_ID=REPLACE_WITH_COGNITO_USER_POOL_CLIENT_ID
6+
ENV_UNITY_UI_AUTH_OAUTH_REDIRECT_URI=REPLACE_WITH_URL_OF_APPLICATION_WITH_PORT_IF_NEEDED
7+
ENV_UNITY_UI_AUTH_OAUTH_LOGOUT_ENDPOINT=REPLACE_WITH_COGNITO_DOMAIN/logout
8+
ENV_UNITY_UI_AUTH_OAUTH_PROVIDER_URL=REPLACE_WITH_COGNITO_DOMAIN/oauth2
9+
ENV_UNITY_UI_AUTH_APP_ADMIN_GROUP_NAME=REPLACE_WITH_USER_POOL_ADMIN_GROUP_NAME
10+
ENV_UNITY_UI_AUTH_APP_APP_VIEWER_GROUP_NAME=REPLACE_WITH_USER_PROOL_VIEWER_GROUP_NAME
11+
12+
# ADS
13+
ENV_UNITY_UI_ADS_URL=REPLACE_WITH_ADS_URL
14+
15+
# DS
16+
VITE_STAC_BROWSER_URL=REPLACE_WITH_STAC_BROWSER_URL
17+
18+
# SPS
19+
ENV_UNITY_UI_SPS_WPST_ENDPOINT=REPLACE_WITH_ADES_WPST_URL

.env/.env.integration

Lines changed: 0 additions & 18 deletions
This file was deleted.

.env/.env.production

Whitespace-only changes.

.env/.env.staging

Whitespace-only changes.

.github/workflows/docker-build.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Docker Build and Push
2+
3+
on:
4+
push:
5+
branches:
6+
- main # or any other branch you want to trigger the workflow
7+
- "features/*"
8+
9+
jobs:
10+
build-and-push:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout Repository
14+
uses: actions/checkout@v4
15+
16+
- name: Log in to Docker Registry
17+
uses: docker/login-action@v3
18+
with:
19+
registry: ghcr.io # replace with your registry if different
20+
username: ${{ github.actor }}
21+
password: ${{ secrets.GITHUB_TOKEN }}
22+
23+
- name: Build and Push "Latest" Docker image
24+
id: build-and-push-latest
25+
uses: docker/build-push-action@v5
26+
with:
27+
context: .
28+
file: ./Dockerfile
29+
push: true
30+
tags: ghcr.io/${{ github.repository }}/unity-ui-application:latest # replace with your image name and tag

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ yarn-debug.log*
1010
yarn-error.log*
1111
pnpm-debug.log*
1212
lerna-debug.log*
13+
.env
14+
!.env/.env
15+
!.env/.env.docker.example
1316

1417
node_modules
1518
dist

CHANGELOG.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [0.5.0] 2024-04-15
9+
- Updated Navbar CSS styling to match Figma designs [#5](https://github.com/unity-sds/unity-ui/issues/5)
10+
- Added CI/CD workflow to build application as a docker image. [#21](https://github.com/unity-sds/unity-ui/issues/21)
11+
- Updated application build configuration. Stateful information has been removed from project configuration. Instead we now allow environment variables to be supplied to the container at startup which in turn get injected into the Unity UI Codebase. This is in support of moving to dynamic configuration of the application via Unity Marketplace. Related to [#3](https://github.com/unity-sds/unity-sds-portal/issues/3)
12+
13+
## [0.4.0] - 2023-12-13
14+
- Updated /job/new endpoint so it lists the applications for which jobs may be executed.
15+
- Moved chirp rebinning job form to /jobs/new/chirp
16+
- Added job submission forms for L1A and L1B PGEs
17+
- Added process utility to help facilitate changes listed above.
18+
19+
## [0.3.1] - 2023-12-12
20+
- Fixed link associated with logo on mobile platforms
21+
22+
## [0.3.0] - 2023-11-13
23+
24+
- Updated environment configurations to account for SIPS-TEST deployments
25+
- Updated scrolling behavior for all UIs so they can be scrolled independently from the navbar. And in the case of the Job Monitoring UI, the detail view scrolls independently from the main view.
26+
827
## [0.2.0] - 2023-10-02
928

1029
- Updated Job Monitoring Dashboard, data is fetched from WPS-T Endpoint
@@ -29,4 +48,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2948
- Integration of React Stellar Navbar component [#73](https://github.com/unity-sds/unity-project-management/issues/73)
3049
- Developed Jobs Monitoring Dashboard — currently loads static data - [#1](https://github.com/unity-sds/unity-jobs-ui/issues/1), [#4],(https://github.com/unity-sds/unity-jobs-ui/issues/4)[#12], (https://github.com/unity-sds/unity-jobs-ui/issues/12)
3150
- Jobs Detail view [#72](https://github.com/unity-sds/unity-jobs-ui/issues/18)
32-
- Integration of generic web view for loading third-party user interfaces
51+
- Integration of generic web view for loading third-party user interfaces

0 commit comments

Comments
 (0)