Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manual annotation was failing when image was EXIF-rotated #724

Merged
merged 21 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a0bdb19
utf-8 encoding
naknomum Aug 22, 2024
f0f51db
add individualNickName and individualFirstEncounterDate/individualLas…
naknomum Aug 22, 2024
fcd3c07
Merge pull request #692 from WildMeOrg/utf8_on_apis
TanyaStere42 Aug 22, 2024
ebc0869
Merge pull request #693 from WildMeOrg/additional_search_fields
TanyaStere42 Aug 22, 2024
285b231
Prevent login from overriding session timeout defined in web.xml
holmbergius Aug 23, 2024
e2ea5fe
Switch welcome.jsp to /react/login/
holmbergius Aug 26, 2024
42a7eb9
Merge pull request #695 from WildMeOrg/690-restore-timeout-default
TanyaStere42 Aug 26, 2024
30dbf3a
Merge pull request #700 from WildMeOrg/699-timeout-modal-login-button
TanyaStere42 Aug 26, 2024
bada9f9
missing german from react update
TanyaStere42 Aug 26, 2024
280ec03
upgraded from alpha to beta
TanyaStere42 Aug 28, 2024
0e6a95d
add de flag, adjust language order in dropdown menu
erinz2020 Aug 29, 2024
3e062b8
Merge pull request #703 from WildMeOrg/missing-de-locale
erinz2020 Aug 29, 2024
0f9d00f
Merge pull request #708 from WildMeOrg/alpha-to-beta-bi
erinz2020 Aug 29, 2024
7e5edf2
fix lint issues
erinz2020 Aug 30, 2024
05ccc33
remove log
erinz2020 Aug 30, 2024
79e9775
add linting files types
erinz2020 Aug 30, 2024
dc2db82
delete unused lines
erinz2020 Aug 30, 2024
81c2cb9
Merge pull request #712 from WildMeOrg/fix-src-lint-issues
TanyaStere42 Aug 30, 2024
74bbe7c
[react][readme] Align example server ports with main README, clarify …
carllelandtaylor Sep 2, 2024
f0dbbb5
Merge pull request #718 from carllelandtaylor/dev-setup-docs-update
erinz2020 Sep 3, 2024
febce5a
math fix TM
naknomum Sep 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@ import globals from "globals";
import pluginJs from "@eslint/js";
import pluginReactConfig from "eslint-plugin-react/configs/recommended.js";


export default [
{languageOptions: { globals: globals.browser }},
pluginJs.configs.recommended,
pluginReactConfig,
{
files: ["**/*.{js,mjs,cjs,jsx}"],
languageOptions: {
globals: globals.browser,
},
rules: {
"react/prop-types": "off",
},
},
];
10 changes: 4 additions & 6 deletions frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
### steps to build and deploy react

1. create a folder `react` under deployed `wildbook/` dir
2. create a `.env` under the root of `REPO/frontend/`, add public-facing url like this:
- `PUBLIC_URL=http://localhost:8080/react/` (for local tomcat)
- `PUBLIC_URL=https://public.url.example.com/react/`
add site name like this:
- `SITE_NAME=Amphibian Wildbook`
2. create a `.env` for React environment variables under the root of `REPO/frontend/`. In this file:
1. Add the public URL. For local tomcat development, use `PUBLIC_URL=http://localhost:81/react/` (or whatever port your local server is running on). For public deployment, use the following, where `public.url.example.com` is your deployed URL: `PUBLIC_URL=https://public.url.example.com/react/`
2. Add site name like this: `SITE_NAME=Amphibian Wildbook`
3. cd to `REPO/frontend/` and run `npm run build`
4. copy everything under `frontend/build/` to the `wildbook/react/` created in step 1
5. refresh your browser page by visiting either `http://localhost:8080/react/` for local testing or `https://public.url.example.com/react/` for the public-facing deployment
5. refresh your browser page by visiting either `http://localhost:81/react/` for local testing or `https://public.url.example.com/react/` for the public-facing deployment


### steps to setup dev environment
Expand Down
23 changes: 12 additions & 11 deletions frontend/config-overrides.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
// config-overrides.js
const webpack = require('webpack');
module.exports = function override(config, env) {
if(env === 'production'){
config.devtool = 'source-map';
/* eslint-disable no-undef */
const webpack = require("webpack");
module.exports = function override(config, env) {
if (env === "production") {
config.devtool = "source-map";
// config.devtool = 'cheap-module-source-map';
}
config.plugins.push(
new webpack.DefinePlugin({
'process.env.SITE_NAME': JSON.stringify(process.env.SITE_NAME),
})
);
return config;
};
config.plugins.push(
new webpack.DefinePlugin({
"process.env.SITE_NAME": JSON.stringify(process.env.SITE_NAME),
}),
);
return config;
};
16 changes: 9 additions & 7 deletions frontend/config/webpack/webpack.dev.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
const path = require('path');
const webpack = require('webpack');
const UnusedWebpackPlugin = require('unused-webpack-plugin');
/* eslint-disable no-undef */

const path = require("path");
const webpack = require("webpack");
const UnusedWebpackPlugin = require("unused-webpack-plugin");

module.exports = {
mode: 'development',
devtool: 'source-map',
mode: "development",
devtool: "source-map",
devServer: {
disableHostCheck: true,
headers: {
'Access-Control-Allow-Origin': '*',
"Access-Control-Allow-Origin": "*",
},
historyApiFallback: true,
hot: true,
Expand All @@ -18,7 +20,7 @@ module.exports = {
plugins: [
new webpack.HotModuleReplacementPlugin(),
new UnusedWebpackPlugin({
directories: [path.join(__dirname, '../../src')],
directories: [path.join(__dirname, "../../src")],
}),
],
};
26 changes: 14 additions & 12 deletions frontend/config/webpack/webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
/* eslint-disable no-undef */

// const webpack = require("webpack");
const { resolve } = require('path');
const path = require('path');
const TerserPlugin = require('terser-webpack-plugin');
const { resolve } = require("path");
const path = require("path");
const TerserPlugin = require("terser-webpack-plugin");

const rootDir = resolve(__dirname, '../../');
const dist = path.resolve(rootDir, 'dist');
const rootDir = resolve(__dirname, "../../");
const dist = path.resolve(rootDir, "dist");

module.exports = {
mode: 'production',
devtool: 'source-map',
mode: "production",
devtool: "source-map",
entry: {
main: path.resolve(rootDir, 'src/index.jsx'),
main: path.resolve(rootDir, "src/index.jsx"),
},
output: {
path: dist,
filename: '[name].js',
chunkFilename: '[name].chunk.js',
publicPath: '/',
filename: "[name].js",
chunkFilename: "[name].chunk.js",
publicPath: "/",
},
optimization: {
minimizer: [new TerserPlugin()],
minimizer: [new TerserPlugin()],
},
};
Loading
Loading