Skip to content

Commit 9fe7edb

Browse files
matsbovmatsbov
committed
Merge remote-tracking branch 'upstream/master' into upgrade
2 parents 096be19 + 5f9b41c commit 9fe7edb

46 files changed

Lines changed: 7787 additions & 6 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@
1212
*.buildinfo
1313
*.substvars
1414
debian/files
15-
debian/ala-sensitive-data-service
15+
debian/ala-sensitive-data-service
16+
ala-sds-static-home/sensitive-species-data.xml
17+
env.txt

‎.vscode/settings.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"workbench.colorCustomizations": {
3+
"activityBar.background": "#253204",
4+
"titleBar.activeBackground": "#344605",
5+
"titleBar.activeForeground": "#F6FDE5"
6+
},
7+
"java.compile.nullAnalysis.mode": "automatic"
8+
}

‎ala-sds-static-home/.gitignore‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
pnpm-debug.log*
8+
lerna-debug.log*
9+
10+
node_modules
11+
dist
12+
dist-ssr
13+
*.local
14+
15+
# Editor directories and files
16+
.vscode/*
17+
!.vscode/extensions.json
18+
.idea
19+
.DS_Store
20+
*.suo
21+
*.ntvs*
22+
*.njsproj
23+
*.sln
24+
*.sw?

‎ala-sds-static-home/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## ALA SDS static home page (legacy)
2+
3+
Before ALA was using `ala-sensitive-data-service`, it had `sds-webapp2`, which was a Grails app that pulled in the `sds` libary. It served API endpoints, generated the `sensitive-species-data.xml` file and provided a simple web front end via the URL `sds.ala.org.au`. `ala-sensitive-data-service` took over the API duties and the XML file generation has been moved to an Airflow job, resulting in the XML files being saved to s3.
4+
5+
This directory contains the static HTML file for the home page from `sds-webapp2`. It links to the XML files via either a direct HTTP Cloudfront URL to the s3 file or by linking to the API for `ala-sensitive-data-service`. The HTML file should be served from s3 via Cloudfriont, similar to the `sensitive-species-data.xml` file.

‎ala-sds-static-home/config/.env.development‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
VITE_APP_SENSITIVE_WS_URL=http://sensitive-ws-test.ala.org.au/ws
2+
VITE_APP_SENSITIVE_SWAGGER_URL=https://sensitive-ws-test.ala.org.au/swagger
3+
VITE_APP_LISTS_URL=https://lists.test.ala.org.au/?filters=isSDS:true
4+
VITE_APP_ALA_HELP_SENSITIVE_URL=https://support.ala.org.au/support/solutions/articles/6000261705-working-with-conservation-and-sensitive-species-information
5+
VITE_APP_SENSITIVE_SPECIES_XML_URL=https://sensitive-ws-test.ala.org.au/sensitive-species-data.xml

‎ala-sds-static-home/config/.env.production‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
VITE_APP_SENSITIVE_WS_URL=http://sensitive-ws.ala.org.au/ws
2+
VITE_APP_SENSITIVE_SWAGGER_URL=https://sensitive-ws.ala.org.au/swagger
3+
VITE_APP_LISTS_URL=https://lists.ala.org.au/public/speciesLists?isSDS=eq:true
4+
# VITE_APP_LISTS_URL=https://lists.ala.org.au/?filters=isSDS:true
5+
VITE_APP_ALA_HELP_SENSITIVE_URL=https://support.ala.org.au/support/solutions/articles/6000261705-working-with-conservation-and-sensitive-species-information
6+
VITE_APP_SENSITIVE_SPECIES_XML_URL=https://sensitive-ws.ala.org.au/sensitive-species-data.xml

‎ala-sds-static-home/config/.env.staging‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
VITE_APP_SENSITIVE_WS_URL=http://sensitive-ws-test.ala.org.au/ws
2+
VITE_APP_SENSITIVE_SWAGGER_URL=https://sensitive-ws-test.ala.org.au/swagger
3+
VITE_APP_LISTS_URL=https://lists.test.ala.org.au/?filters=isSDS:true
4+
VITE_APP_ALA_HELP_SENSITIVE_URL=https://support.ala.org.au/support/solutions/articles/6000261705-working-with-conservation-and-sensitive-species-information
5+
VITE_APP_SENSITIVE_SPECIES_XML_URL=https://sensitive-ws-test.ala.org.au/sensitive-species-data.xml

‎ala-sds-static-home/config/.env.testing‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
VITE_APP_SENSITIVE_WS_URL=http://sensitive-ws-test.ala.org.au/ws
2+
VITE_APP_SENSITIVE_SWAGGER_URL=https://sensitive-ws.test.ala.org.au/swagger
3+
VITE_APP_LISTS_URL=https://lists.test.ala.org.au/?filters=isSDS:true
4+
VITE_APP_ALA_HELP_SENSITIVE_URL=https://support.ala.org.au/support/solutions/articles/6000261705-working-with-conservation-and-sensitive-species-information
5+
VITE_APP_SENSITIVE_SPECIES_XML_URL=https://sensitive-ws-test.ala.org.au/sensitive-species-data.xml

‎ala-sds-static-home/eslint.config.ts‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
import eslintJs from '@eslint/js';
2+
import tseslint from 'typescript-eslint';
3+
import globals from 'globals'
4+
import pluginReactHooks from 'eslint-plugin-react-hooks'
5+
import pluginReactRefresh from 'eslint-plugin-react-refresh'
6+
import { fileURLToPath } from 'node:url';
7+
import { dirname } from 'node:path';
8+
9+
// FlatConfigItem type can be imported from 'eslint' or 'typescript-eslint' if needed,
10+
// but tseslint.config() handles much of the typing.
11+
12+
const currentModuleDir = dirname(fileURLToPath(import.meta.url));
13+
14+
export default tseslint.config(
15+
// 1. Global ignores
16+
{
17+
ignores: [
18+
'dist/', // Build output
19+
'eslint.config.ts', // This configuration file
20+
'vite.config.ts', // Vite configuration file
21+
'**/*.config.js', // Other JavaScript config files (e.g., postcss.config.js)
22+
// Add any other generated files or directories if necessary
23+
],
24+
},
25+
26+
// 2. Base ESLint recommended rules for JavaScript
27+
eslintJs.configs.recommended,
28+
29+
// 3. TypeScript configurations
30+
// This applies @typescript-eslint/parser, @typescript-eslint/eslint-plugin,
31+
// and recommended (type-checked) rules to .ts, .tsx, .mts, .cts files.
32+
...tseslint.configs.recommendedTypeChecked,
33+
34+
// 4. React specific configurations (for .jsx and .tsx files)
35+
{
36+
files: ['**/*.{jsx,tsx}'],
37+
plugins: {
38+
'react-hooks': pluginReactHooks,
39+
'react-refresh': pluginReactRefresh,
40+
},
41+
rules: {
42+
// Apply recommended rules from eslint-plugin-react-hooks
43+
...pluginReactHooks.configs.recommended.rules,
44+
// Configure eslint-plugin-react-refresh
45+
'react-refresh/only-export-components': [
46+
'warn',
47+
{ allowConstantExport: true },
48+
],
49+
},
50+
languageOptions: {
51+
// Ensure browser globals are available in React components
52+
globals: {
53+
...globals.browser,
54+
},
55+
},
56+
settings: {
57+
// Optional: specify React version, 'detect' usually works
58+
react: {
59+
version: 'detect',
60+
},
61+
},
62+
},
63+
64+
// 5. Customizations and overrides for all relevant files (JS, JSX, TS, TSX)
65+
{
66+
files: ['**/*.{js,jsx,ts,tsx}'], // Apply to all JS/TS source files
67+
languageOptions: {
68+
globals: {
69+
...globals.browser, // General browser globals for all source files
70+
// ...globals.node, // Add if Node.js globals are needed in some source files (e.g. vite.config.ts if linted)
71+
},
72+
},
73+
rules: {
74+
// Customize @typescript-eslint/no-unused-vars.
75+
// This rule is enabled by tseslint.configs.recommendedTypeChecked.
76+
// We are overriding its options here to match your previous 'no-unused-vars' config
77+
// and add common TypeScript best practices.
78+
'@typescript-eslint/no-unused-vars': [
79+
'error',
80+
{
81+
vars: 'all',
82+
varsIgnorePattern: '^[A-Z_]', // Matches original: varsIgnorePattern for unused variables
83+
args: 'after-used',
84+
argsIgnorePattern: '^_', // Common practice for unused function arguments
85+
ignoreRestSiblings: true,
86+
},
87+
],
88+
},
89+
},
90+
91+
// 6. Specific configuration for TypeScript files to set `parserOptions.project`
92+
// This is essential for `tseslint.configs.recommendedTypeChecked` to work effectively.
93+
{
94+
files: ['**/*.{ts,tsx}'],
95+
languageOptions: {
96+
parserOptions: {
97+
project: true, // Automatically finds tsconfig.json relative to tsconfigRootDir
98+
tsconfigRootDir: currentModuleDir, // Assumes eslint.config.ts is at the project root (ala-sds-static-home)
99+
},
100+
},
101+
}
102+
);
103+

‎ala-sds-static-home/index.html‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6+
<meta name="app.version" content="1.7.1" />
7+
<meta name="app.build" content="" />
8+
<meta name="description" content="Atlas of Living Australia" />
9+
<meta name="author" content="Atlas of Living Australia">
10+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
11+
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
12+
<title>ALA Sensitive Data Service</title>
13+
<link href="https://www.ala.org.au/commonui-bs3-2019/css/bootstrap.min.css" rel="stylesheet" media="screen,print" />
14+
<link href="https://www.ala.org.au/commonui-bs3-2019/css/bootstrap-theme.min.css" rel="stylesheet"
15+
media="screen,print" />
16+
<link href="https://www.ala.org.au/commonui-bs3-2019/css/ala-styles.css" rel="stylesheet" media="screen,print" />
17+
<link href="https://www.ala.org.au/commonui-bs3-2019/css/autocomplete.min.css" rel="stylesheet"
18+
media="screen,print" />
19+
<link href="https://www.ala.org.au/commonui-bs3-2019/css/autocomplete-extra.min.css" rel="stylesheet"
20+
media="screen,print" />
21+
<link href="https://www.ala.org.au/commonui-bs3-2019/css/font-awesome.min.css" rel="stylesheet"
22+
media="screen,print" />
23+
<script type="text/javascript" src="https://www.ala.org.au/commonui-bs3-2019/js/jquery.min.js"></script>
24+
<script type="text/javascript" src="https://www.ala.org.au/commonui-bs3-2019/js/jquery-migration.min.js"></script>
25+
<script type="text/javascript" src="https://www.ala.org.au/commonui-bs3-2019/js/autocomplete.min.js"></script>
26+
<script type="text/javascript" src="https://www.ala.org.au/commonui-bs3-2019/js/application.js" defer></script>
27+
<script type="text/javascript" src="https://www.ala.org.au/commonui-bs3-2019/js/bootstrap.min.js"></script>
28+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
29+
</head>
30+
<body>
31+
<div id="root"></div>
32+
<script type="module" src="/src/main.jsx"></script>
33+
<script type="text/javascript" src="https://s3.amazonaws.com/assets.freshdesk.com/widget/freshwidget.js"></script>
34+
<script type="text/javascript">
35+
// This script will be handled in a React useEffect hook for better control
36+
</script>
37+
</body>
38+
</html>

0 commit comments

Comments
 (0)