Skip to content

Commit

Permalink
Merge branch 'main' into releaser
Browse files Browse the repository at this point in the history
  • Loading branch information
JamieSlome authored May 3, 2024
2 parents ace3d17 + e5caeb1 commit 96aace1
Show file tree
Hide file tree
Showing 193 changed files with 7,876 additions and 5,745 deletions.
2 changes: 2 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VITE_API_URI=http://localhost:8080
VITE_SERVER_URI=http://localhost:8000
1 change: 1 addition & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_API_URI=
40 changes: 0 additions & 40 deletions .eslintrc.cjs

This file was deleted.

41 changes: 41 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"parser": "@babel/eslint-parser",
"env": {
"node": true,
"browser": true,
"commonjs": true,
"es2021": true,
"mocha": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"google",
"prettier",
"plugin:json/recommended"
],
"overrides": [],
"parserOptions": {
"requireConfigFile": false,
"ecmaVersion": 12,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true,
"modules": true
},
"babelOptions": {
"presets": ["@babel/preset-react"]
}
},
"plugins": ["react", "prettier"],
"rules": {
"react/prop-types": "off",
"require-jsdoc": "off",
"no-async-promise-executor": "off"
},
"settings": {
"react": {
"version": "detect"
}
}
}
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
mongodb-version: [4.4]

steps:
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
with:
fetch-depth: 0

Expand All @@ -47,7 +47,7 @@ jobs:
npm run test-coverage-ci --workspaces --if-present
- name: Upload test coverage report
uses: codecov/[email protected].0
uses: codecov/[email protected].1
with:
files: ./coverage/lcov.info
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cve-scanning-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
node-version: ${{ env.NODE_VERSION }}

- name: Code Checkout
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v4
with:
Expand Down
10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"semi": true,
"tabWidth": 2,
"printWidth": 100,
"singleQuote": true,
"trailingComma": "all",
"jsxSingleQuote": true,
"bracketSpacing": true,
"arrowParens": "always"
}
25 changes: 11 additions & 14 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{
"javascript.suggestionActions.enabled": false,
"editor.tabSize": 2,
"files.eol": "\n",
"terminal.integrated.disableLineWrapping": true,
"debug.console.wordWrap": false,
"editor.wordWrap": "off",
"editor.codeActionsOnSave": {
"source.fixAll": true
},
"eslint.validate": [
"javascript",
"javascriptreact",
]
}
"javascript.suggestionActions.enabled": false,
"editor.tabSize": 2,
"files.eol": "\n",
"debug.console.wordWrap": false,
"editor.wordWrap": "off",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
}
39 changes: 35 additions & 4 deletions config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,37 @@
"description": "Configuration for customizing git-proxy",
"type": "object",
"properties": {
"proxyUrl": { "type": "string" },
"cookieSecret": { "type": "string" },
"sessionMaxAgeHours": { "type": "number" },
"api": {
"description": "Third party APIs",
"type": "object"
},
"commitConfig": {
"description": "Enforce rules and patterns on commits including e-mail and message",
"type": "object"
},
"attestationConfig": {
"description": "Customisable questions to add to attestation form",
"type": "object"
},
"privateOrganizations": {
"description": "Pattern searches for listed private organizations are disabled",
"type": "array"
},
"urlShortener": {
"description": "Customisable URL shortener to share in proxy responses and warnings",
"type": "string"
},
"contactEmail": {
"description": "Customisable e-mail address to share in proxy responses and warnings",
"type": "string"
},
"csrfProtection": {
"description": "Flag to enable CSRF protections for UI",
"type": "boolean"
},
"authorisedList": {
"description": "List of repositories that are authorised to be pushed to through the proxy.",
"type": "array",
Expand Down Expand Up @@ -46,7 +77,7 @@
"name": { "type": "string" },
"url": { "type": "string" }
},
"required": [ "project", "name", "url" ]
"required": ["project", "name", "url"]
},
"database": {
"type": "object",
Expand All @@ -57,7 +88,7 @@
"options": { "type": "object" },
"params": { "type": "object" }
},
"required": [ "type", "enabled" ]
"required": ["type", "enabled"]
},
"authentication": {
"type": "object",
Expand All @@ -66,8 +97,8 @@
"enabled": { "type": "boolean" },
"options": { "type": "object" }
},
"required": [ "type", "enabled" ]
"required": ["type", "enabled"]
}
},
"additionalProperties": false
}
}
41 changes: 18 additions & 23 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,48 @@
*/
-->
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="theme-color" content="#000000" />
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="manifest" href="/manifest.json" />
<link rel="shortcut icon" href="/favicon.ico" />
<link
rel="apple-touch-icon"
sizes="76x76"
href="/apple-icon.png"
/>
<link
rel="stylesheet"
href="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css"
/>
<link rel="apple-touch-icon" sizes="76x76" href="/apple-icon.png" />
<link rel="stylesheet" href="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css" />

<script src="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.js"></script>
<script
src="https://cdn.jsdelivr.net/chartist.js/0.11.0/chartist.min.js"
integrity="sha384-BnJvHBnDyKVZFn8I5i6LHXOscPlizGS+cgZi1crgdHmjU9lVKXwtNsqXQ521P++Z"
crossorigin="anonymous"
></script>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons"
/>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
<link
href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet"
href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
/>

<link
rel="stylesheet"
href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
type="text/css"
href="https://cdn.jsdelivr.net/npm/diff2html/bundles/css/diff2html.min.css"
/>

<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/diff2html/bundles/css/diff2html.min.css" />

<!--
Notice the use of %PUBLIC_URL% in the tags above.
Notice the use of / in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
Unlike "/favicon.ico" or "favicon.ico", "//favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
Expand All @@ -73,7 +68,6 @@
<body>
<noscript> You need to enable JavaScript to run this app. </noscript>
<div id="root"></div>
<script type="module" src="/src/index.jsx"></script>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand All @@ -85,4 +79,5 @@
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
<script type="module" src="/src/index.jsx"></script>
</html>
Loading

0 comments on commit 96aace1

Please sign in to comment.