Merge pull request #335 from finos/reconcile

Reconcile Git Proxy with most up-to-date improvements

Author: JamieSlome

.env.development

@@ -0,0 +1,2 @@
+VITE_API_URI=http://localhost:8080
+VITE_SERVER_URI=http://localhost:8000

.env.production

@@ -0,0 +1 @@
+VITE_API_URI=

.eslintrc.cjs

@@ -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"
+    }
+  }
+}

.eslintrc.json

@@ -0,0 +1,10 @@
+{
+  "semi": true,
+  "tabWidth": 2,
+  "printWidth": 100,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "jsxSingleQuote": true,
+  "bracketSpacing": true,
+  "arrowParens": "always"
+}

.prettierrc

@@ -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
+}

.vscode/settings.json

@@ -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",
@@ -46,7 +77,7 @@
         "name": { "type": "string" },
         "url": { "type": "string" }
       },
-      "required": [ "project", "name", "url" ]
+      "required": ["project", "name", "url"]
     },
     "database": {
       "type": "object",
@@ -57,7 +88,7 @@
         "options": { "type": "object" },
         "params": { "type": "object" }
       },
-      "required": [ "type", "enabled" ]
+      "required": ["type", "enabled"]
     },
     "authentication": {
       "type": "object",
@@ -66,8 +97,8 @@
         "enabled": { "type": "boolean" },
         "options": { "type": "object" }
       },
-      "required": [ "type", "enabled" ]
+      "required": ["type", "enabled"]
     }
   },
   "additionalProperties": false
-}
+}

config.schema.json

@@ -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`.
         -->
@@ -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.
@@ -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>