UoA-eResearch · dependabot · Nov 18, 2021 · Nov 18, 2021 · Nov 18, 2021 · Nov 19, 2021
diff --git a/.env.example b/.env.example
@@ -0,0 +1,10 @@
+# Copy this file to .env, then fill it in with credentials.
+# For stages other than sandbox/dev E.g when requiring Connect Non-prod AWS userpool. 
+# Copy this file to .<stage>.env and fill it with stage specific values.
+
+# cer-graphql variables
+CONTENTFUL_ACCESS_TOKEN=
+CONTENTFUL_SPACE_ID=
+CONTENTFUL_ENVIRONMENT_ID=
+COGNITO_REGION=
+COGNITO_USER_POOL=
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,46 @@
+version: 2
+updates:
+  - package-ecosystem: 'npm'
+    directory: '/research-hub-web'
+    schedule:
+      interval: 'weekly'
+    open-pull-requests-limit: 1
+    reviewers:
+      - Trombach
+      - cakr322
+      - eric-el-tan
+    allow:
+      - dependency-type: 'direct'
+  - package-ecosystem: 'npm'
+    directory: '/cer-graphql'
+    schedule:
+      interval: 'weekly'
+    open-pull-requests-limit: 1
+    reviewers:
+      - uoa-noel
+      - cakr322
+      - eric-el-tan
+    allow:
+      - dependency-type: 'direct'
+  - package-ecosystem: 'npm'
+    directory: '/hub-search-proxy'
+    schedule:
+      interval: 'weekly'
+    open-pull-requests-limit: 1
+    reviewers:
+      - Trombach
+      - cakr322
+      - eric-el-tan
+    allow:
+      - dependency-type: 'direct'
+  - package-ecosystem: 'npm'
+    directory: '/subhub-link-checker'
+    schedule:
+      interval: 'weekly'
+    open-pull-requests-limit: 1
+    reviewers:
+      - uoa-noel
+      - cakr322
+      - eric-el-tan
+    allow:
+      - dependency-type: 'direct'
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,20 @@
+## Description
+<!--- Describe the feature or bug fix that this PR addresses -->
+<!--- Feature: Attach wireframes or link to relevant design documentation if applicable -->
+<!--- Bug fix: Describe the root cause and analysis of the problem -->
+
+## Solution
+<!--- Feature: Describe your code changes, and mention if any existing features/functionality is affected by the changes. -->
+<!--- Bug Fix: Describe your code changes, and explain the technical solution and how it fixes the issue -->
+
+## Screenshots
+<!--- Add before and after screenshots of the UI if applicable -->
+
+## Testing
+<!--- Describe unit or e2e tests if they were required for this feature/fix -->
+
+## Have the changes been checked in the following browsers?
+- [x] Chrome
+- [x] Safari
+- [x] Firefox
+- [x] Edge
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -0,0 +1,36 @@
+name: Lint
+
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  run-linters:
+    name: Run linters
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 18
+
+      - name: Install Node.js dependencies
+        working-directory: ./research-hub-web
+        run: npm ci --force
+
+      - name: Install Angular CLI
+        run: npm install -g @angular/cli
+
+      - name: ng lint
+        working-directory: ./research-hub-web
+        run: ng lint
@@ -1,5 +1,8 @@
 name: Lint
+permissions:
+  contents: read
+
 on:
  # Trigger the workflow on push or pull request,
  # but only for the main branch
@@ -1,5 +1,8 @@
 name: Lint

+permissions:
+  contents: read
+
 on:
  # Trigger the workflow on push or pull request,
  # but only for the main branch
diff --git a/.github/workflows/sentry.yml b/.github/workflows/sentry.yml
@@ -0,0 +1,33 @@
+name: Sentry Release
+
+on:
+  push:
+    branches:
+      - dev
+      - test
+      - prod
+    paths:
+      - 'research-hub-web/**'
+
+jobs:
+  sentry-release:
+    name: Create Sentry Release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+      - name: Get Branch
+        id: var
+        run: echo ::set-output name=branch::${GITHUB_REF#refs/*/}
+      - name: Output Branch
+        run: echo ${{ steps.var.outputs.branch }}
+      - name: Notify Sentry
+        # https://github.com/getsentry/action-release
+        uses: getsentry/action-release@v1.1.6
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: university-of-auckland-7o
+          SENTRY_PROJECT: research-hub
+        with:
+          environment: ${{ steps.var.outputs.branch }}
@@ -1,4 +1,6 @@
 name: Sentry Release
+permissions:
+  contents: read
 on:
  push:
@@ -1,4 +1,6 @@
 name: Sentry Release
+permissions:
+  contents: read

 on:
  push:
diff --git a/.gitignore b/.gitignore
@@ -13,8 +13,17 @@ logs
 npm-debug.log*
 
 # ==================== research-hub-web ================ #
+research-hub-web/www/
+research-hub-web/www-preview/
 research-hub-web/dist/
 research-hub-web/documentation/
+research-hub-web/cypress/videos/
+research-hub-web/cypress/screenshots/
+
+research-hub-web/src/app/graphql/possible-types.ts
+research-hub-web/src/app/graphql/schema.ts
+
+research-hub-web/.angular/cache
 
 # Custom environment file - use it in special local development situations
 research-hub-web/src/environments/environment.custom.ts
@@ -28,10 +37,18 @@ research-hub-web/npm-debug.log
 research-hub-web/testem.log
 research-hub-web/typings
 
-# ====================== cer-graphql =================== #
-
+# Ignore config file so secrets are not automatically checked in
+.env
+.test.env
+.prod.env
 
 
 # ====================== serverless-now ================ #
 serverless-now/.serverless/
+serverless-now/env/local.env
+
+# ====================== cer-graphql =================== #
+cer-graphql/build
 
+# ====================== subhub-link-checker =========== #
+subhub-link-checker/build/*
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,37 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "preLaunchTask": "research-hub-web - start",
+            "url": "http://localhost:4200",
+            "webRoot": "${workspaceFolder}/research-hub-web/"
+        },
+        {
+            "name": "Attach to Firefox",
+            "type": "firefox",
+            "request": "attach",
+            "url": "http://localhost:4200/",
+            "webRoot": "${workspaceFolder}/research-hub-web/",
+            "preLaunchTask": "research-hub-web - start"
+        },
+        {
+            "type": "pwa-chrome",
+            "request": "attach",
+            "name": "Attach to Karma",
+            "address": "localhost",
+            "port": 9222,
+            "timeout": 600000,
+            "sourceMaps": true,
+            "webRoot": "${workspaceFolder}/research-hub-web/",
+            "pathMapping": {
+                "/_karma_webpack_": "${workspaceFolder}/research-hub-web/"
+            }
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,114 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "npm",
+			"script": "start",
+			"path": "research-hub-web/",
+			"label": "research-hub-web - start",
+			"group": "build",
+			"dependsOrder": "sequence",
+			"dependsOn": ["research-hub-web - run GraphQL server"],
+			"presentation": {
+				"group": "web"
+			},
+			"isBackground": true,
+			"problemMatcher": {
+				"owner": "custom",
+				"fileLocation": ["relative", "${workspaceFolder}"],
+				"pattern":[{
+					// TODO Stub pattern, doesn't actually match problems.
+					// Added as it's required
+					"regexp": "^([^\\\\s].*)\\\\((\\\\d+,\\\\d+)\\\\):\\\\s*(.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				}],
+				"background": {
+					"activeOnStart": true,
+					"beginsPattern": "^.*Generating browser application bundles",
+					"endsPattern": "^.*Angular Live Development Server is listening on.*"
+				}
+			},
+		},
+		{
+			"type": "npm",
+			"script": "graphql-server-watch",
+			"path": "research-hub-web/",
+			"problemMatcher": {
+				"owner": "custom",
+				"fileLocation": ["relative", "${workspaceFolder}"],
+				"pattern":[{
+					// TODO Stub pattern, doesn't actually match problems.
+					// Added as it's required
+					"regexp": "^([^\\\\s].*)\\\\((\\\\d+,\\\\d+)\\\\):\\\\s*(.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				}],
+				"background": {
+					"beginsPattern": "Loading remote schema...",
+					"endsPattern": "^.*Content API server ready.*$"
+				}
+			},
+			"label": "research-hub-web - run GraphQL server",
+			"presentation": {
+				"group": "web"
+			},
+			"isBackground": true
+		},
+		{
+			"type": "npm",
+			"script": "generate-watch",
+			"path": "research-hub-web/",
+			"problemMatcher": {
+				"owner": "custom",
+				"fileLocation": ["relative", "${workspaceFolder}"],
+				"pattern":[{
+					// TODO Stub pattern, doesn't actually match problems.
+					// Added as it's required
+					"regexp": "^([^\\\\s].*)\\\\((\\\\d+,\\\\d+)\\\\):\\\\s*(.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				}],
+				"background": {
+					"beginsPattern": "^.*Parse configuration",
+					"endsPattern": "^.*Watching for changes..."
+				}
+			},
+			"label": "research-hub-web - generate GraphQL types",
+			"presentation": {
+				"group": "web"
+			},
+			"isBackground": true
+		},
+		{
+			"type": "npm",
+			"script": "test-watch",
+			"path": "research-hub-web/",
+			"problemMatcher": {
+				"owner": "custom",
+				"fileLocation": ["relative", "${workspaceFolder}"],
+				"pattern":[{
+					// TODO Stub pattern, doesn't actually match problems.
+					// Added as it's required
+					"regexp": "^([^\\\\s].*)\\\\((\\\\d+,\\\\d+)\\\\):\\\\s*(.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				}],
+				"background": {
+					"beginsPattern": "^.*Generating browser application bundles",
+					"endsPattern": "^.*Coverage summary"
+				}
+			},
+			"label": "research-hub-web - test",
+			"presentation": {
+				"group": "web"
+			},
+			"isBackground": true
+		}
+
+	]
+}
diff --git a/Dev_Journey_V3.drawio.svg b/Dev_Journey_V3.drawio.svg