Skip to content

[STALE] Add login #8

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
geoerika wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[STALE] Add login #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94ad0f1
deps - add @eqworks/common-login comp & necessary deps
geoerika Dec 9, 2021
5355311
App - add Authenticated comp
geoerika Dec 9, 2021
a98cbee
netlify - add api, keywarden keys
geoerika Dec 9, 2021
af578fb
netlify - create npmrc for eqworks npm registry
geoerika Dec 9, 2021
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
3 changes: 3 additions & 0 deletions .netlify/.npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@eqworks:registry=https://npm.pkg.github.com/
//npm.pkg.github.com/:_authToken=${GITHUB_TOKEN}
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
9 changes: 9 additions & 0 deletions netlify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,17 @@
[build.environment]
# https://community.netlify.com/t/support-guide-using-private-npm-modules-on-netlify/795/65
YARN_VERSION = "1.22.10"
NPM_CONFIG_USERCONFIG = "./.netlify/.npmrc"
REACT_APP_API_HOST = "https://api.locus.place"
REACT_APP_API_STAGE = "dev"
REACT_APP_KEY_WARDEN_HOST = "https://auth.eqworks.io"
REACT_APP_KEY_WARDEN_STAGE = "dev"

[context.production.environment]
REACT_APP_API_HOST = "https://api.locus.place"
REACT_APP_API_STAGE = "prod"
REACT_APP_KEY_WARDEN_HOST = "https://auth.eqworks.io"
REACT_APP_KEY_WARDEN_STAGE = "prod"

[context.deploy-preview]
ignore = "git diff --quiet HEAD^ HEAD src/ index.html package.json yarn.lock"
10 changes: 9 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,21 @@
"dependencies": {
"@emotion/react": "^11.6.0",
"@emotion/styled": "^11.6.0",
"@mui/material": "^5.2.0",
"@eqworks/common-login": "0.9.0-alpha.1",
"@eqworks/react-labs": "^1.12.0",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"@mui/material": "^5.2.3",
"@tailwindcss/postcss7-compat": "^2.1.2",
"mapbox-gl": ">=0.32.1 <2.0.0",
"mapbox-gl-compare": "^0.4.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-map-gl": "^5.2.5",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"tailwindcss": "yarn:@tailwindcss/postcss7-compat@^2.1.2",
"use-debounce": "^7.0.1"
},
"eslintConfig": {
Expand Down
35 changes: 19 additions & 16 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useState } from 'react'

import { Authenticated } from '@eqworks/common-login'
import Grid from '@mui/material/Grid'
import { ThemeProvider, createTheme } from '@mui/material/styles'

Expand All @@ -19,23 +20,25 @@ const App = () => {
const [showBuildings, setShowBuildings] = useState(true)

return (
<ThemeProvider theme={customTheme}>
<TopBar />
<Grid container spacing={2} >
<Grid item sm={2}>
<Controls
setTargetLocation={setLocation}
setShowMapBuildings={setShowBuildings}
/>
<Authenticated product='locus'>
<ThemeProvider theme={customTheme}>
<TopBar />
<Grid container spacing={2} >
<Grid item sm={2}>
<Controls
setTargetLocation={setLocation}
setShowMapBuildings={setShowBuildings}
/>
</Grid>
<Grid item sm={10}>
<CompareMap
location={location}
showBuildings={showBuildings}
/>
</Grid>
</Grid>
<Grid item sm={10}>
<CompareMap
location={location}
showBuildings={showBuildings}
/>
</Grid>
</Grid>
</ThemeProvider>
</ThemeProvider>
</Authenticated>
)
}

Expand Down
Loading