Skip to content

Implement Three.js viewer for redesigned viewers #511

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.

Sign up for GitHub

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

Open
KrisDavie wants to merge 12 commits into
base: viewer-redesign
Choose a base branch
from
Open

Implement Three.js viewer for redesigned viewers #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b89c7bb
Fix authentication provider
KrisDavie Mar 14, 2022
04ca602
Add backend schema for coords
KrisDavie Mar 14, 2022
5867dc0
Add frontend functions and data store for coords
KrisDavie Mar 14, 2022
71d71bb
Preliminary viewer implementation (broken - loop)
KrisDavie Mar 14, 2022
62131ba
Working viewer
KrisDavie Mar 15, 2022
16d3fef
Add typing, use shaders
KrisDavie Mar 15, 2022
9b70341
Remove dynamic size and adjust default
KrisDavie Mar 15, 2022
49e075f
Client linting
KrisDavie Mar 15, 2022
04bfc8c
Include the project in the coordinates request
MaybeJustJames Mar 15, 2022
223e729
Try to make semgrep happy
MaybeJustJames Mar 15, 2022
43ca1e8
Clean up Hack Coordinate HTTP endpoint
MaybeJustJames Mar 15, 2022
a15ed69
Respect the types man
MaybeJustJames Mar 15, 2022
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
29 changes: 26 additions & 3 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 18 additions & 5 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"react-table": "^6.8.6",
"redux": "^4.0.5",
"redux-saga": "^1.1.3",
"semantic-ui-react": "^2.0.1"
"semantic-ui-react": "^2.0.1",
"three": "^0.138.3"
},
"devDependencies": {
"@babel/cli": "^7.12.8",
Expand All @@ -73,6 +74,7 @@
"@types/react": "^16.14.2",
"@types/react-dom": "^16.9.10",
"@types/react-redux": "^7.1.11",
"@types/three": "^0.138.0",
"@typescript-eslint/eslint-plugin": "^5.5.0",
"@typescript-eslint/parser": "^5.5.0",
"babel-jest": "^27.0.6",
Expand Down Expand Up @@ -152,7 +154,10 @@
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"plugins": [
"react",
"@typescript-eslint"
],
"rules": {
"prettier/prettier": "error",
"no-unused-vars": [
Expand All @@ -170,9 +175,17 @@
"no-var": "warn",
"react/prop-types": "off",
"react/jsx-key": "off",
"eqeqeq": ["error", "always"],
"curly": ["error", "all"],
"no-bitwise": ["error"]
"eqeqeq": [
"error",
"always"
],
"curly": [
"error",
"all"
],
"no-bitwise": [
"error"
]
},
"settings": {
"react": {
Expand Down
3 changes: 2 additions & 1 deletion client/src/api/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ const decodeProvider = (data: unknown): Result<Provider, string> => {
'url' in data &&
typeof (data as { id: unknown }).id === 'number' &&
typeof (data as { name: unknown }).name === 'string' &&
typeof (data as { icon: unknown }).icon === 'string' &&
(typeof (data as { icon: unknown }).icon === 'string' ||
(data as { icon: unknown }).icon === null) &&
typeof (data as { url: unknown }).url === 'string'
) {
const provider: Provider = {
Expand Down
24 changes: 24 additions & 0 deletions client/src/api/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,27 @@ export async function makeProject(
return error(`Cannot create project: ${JSON.stringify(err)}`);
}
}

export type Coordinate = {
x: number;
y: number;
};

export async function getCoordinates(
project: string,
dataset: number
): Promise<Array<Coordinate>> {
const url = new URL(API_URL + 'data/dataset');
url.search = new URLSearchParams({
project,
dataset: `${dataset}`,
}).toString();
const response = await fetch(url.toString(), {
method: 'GET',
headers: {
Accept: 'application/json',
},
});

return (await response.json()) as Array<Coordinate>;
}
Loading