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

Integrate column builder web application #234

Merged
merged 222 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
222 commits
Select commit Hold shift + click to select a range
c4d032d
move and rename folders
Idzikowski-Casey Apr 19, 2022
cb7a300
getServerSideProps for all data fetching
Idzikowski-Casey Apr 19, 2022
fa0adb1
dynamic routing
Idzikowski-Casey Apr 19, 2022
c3b4c52
fixed some last min bugs
Idzikowski-Casey Apr 20, 2022
f1813c2
strat_name routing
Idzikowski-Casey Apr 20, 2022
ae23603
unused imports
Idzikowski-Casey Apr 20, 2022
d4a8187
more descriptive view names
Idzikowski-Casey Apr 20, 2022
66944a0
new api view name
Idzikowski-Casey Apr 20, 2022
892d07e
documentation
Idzikowski-Casey Apr 20, 2022
e3686ba
view name error
Idzikowski-Casey Apr 20, 2022
d16df98
small changes
Idzikowski-Casey Apr 20, 2022
096eb72
Added some things that are required for working in docker
davenquinn Apr 20, 2022
36fe969
changes to environmental variables and docker profiles
Idzikowski-Casey Apr 22, 2022
d34b909
Merge pull request #8 from UW-Macrostrat/docker-fixes
Idzikowski-Casey Apr 22, 2022
01f231a
helper btns for merging sections
Idzikowski-Casey Apr 25, 2022
d49f458
header
Idzikowski-Casey Apr 25, 2022
c1f3cb7
Item Select and renamed Suggest component; liths and envs select better
Idzikowski-Casey Apr 25, 2022
4e13e35
rename suggest, bp3 style global; col build skeleton
Idzikowski-Casey Apr 25, 2022
2b58a60
mini-unit editor with parsed out reusable components; menu modifiers …
Idzikowski-Casey Apr 25, 2022
372a51e
added optional lith_unit to UnitsView interface
Idzikowski-Casey Apr 25, 2022
31ad378
lith helper text, table join in postgrest api call
Idzikowski-Casey Apr 25, 2022
df220fc
position increment btns
Idzikowski-Casey Apr 26, 2022
15d5d99
enhanced unit adding and section building
Idzikowski-Casey Apr 26, 2022
53a4ba9
more options for components and bug fixes
Idzikowski-Casey Apr 26, 2022
cf476ca
rough skeleton for building quickly
Idzikowski-Casey Apr 26, 2022
6c25eb3
lng/lat chooser
Idzikowski-Casey May 3, 2022
75c6a42
more types
Idzikowski-Casey May 3, 2022
d6c417d
macrostrat components
Idzikowski-Casey May 3, 2022
908acf4
full units column view
Idzikowski-Casey May 3, 2022
c1942bb
colsection and colunit rows
Idzikowski-Casey May 3, 2022
cf58f1b
types and styles
Idzikowski-Casey May 3, 2022
c4a4dfb
types and styles
Idzikowski-Casey May 3, 2022
b4598c3
unit cell group parsed
Idzikowski-Casey May 3, 2022
8a0b26a
long/lat map
Idzikowski-Casey May 3, 2022
32e039a
ui-components monorepo as gitsubmodule
Idzikowski-Casey May 4, 2022
acfb42d
Merge pull request #9 from UW-Macrostrat/submodule
Idzikowski-Casey May 4, 2022
e328794
drag and drop rows
Idzikowski-Casey May 4, 2022
475a4da
lots new changes
Idzikowski-Casey May 6, 2022
a97f371
final iteration on unit modal editor; draggable overlay
Idzikowski-Casey May 9, 2022
60e7ac4
persist change wip
Idzikowski-Casey May 9, 2022
d46df69
row editors; menu btns; cell widths; and more
Idzikowski-Casey May 10, 2022
d6206f8
ui-components dependencies
Idzikowski-Casey May 11, 2022
7e404d1
base_path and asset_prefix
Idzikowski-Casey May 11, 2022
0e62d3c
ignore env files
Idzikowski-Casey May 11, 2022
727d1a0
production dockerfile
Idzikowski-Casey May 11, 2022
04f6fad
need axios for peerDep
Idzikowski-Casey May 11, 2022
340c427
need axios for peerDep
Idzikowski-Casey May 11, 2022
50eab44
move files around for docker stuff
Idzikowski-Casey May 11, 2022
509f7e4
env changes
Idzikowski-Casey May 11, 2022
14db4c8
config
Idzikowski-Casey May 11, 2022
0cf56a6
ui-components
Idzikowski-Casey May 11, 2022
2ada8db
fixes
Idzikowski-Casey May 11, 2022
f78555e
remove 1 from fkey specification
May 13, 2022
4a78fc4
postinstall for installing all gitsubmodule dependencies
May 13, 2022
417a57a
smaller image
May 13, 2022
8d8787c
Merge pull request #12 from UW-Macrostrat/docker
Idzikowski-Casey May 13, 2022
5778822
routing changes, data fetching happens sever side instead of onClick
Idzikowski-Casey May 13, 2022
afd9cbc
update popover2
Idzikowski-Casey May 13, 2022
3adcd38
lat/lng column
Idzikowski-Casey May 13, 2022
af63d6b
column editor improvements
Idzikowski-Casey May 13, 2022
c1b1994
null coalesce
Idzikowski-Casey May 16, 2022
79f3fee
unused import
Idzikowski-Casey May 16, 2022
d2872fa
column editor
Idzikowski-Casey May 16, 2022
6254826
actions for adding and editing units at indexes
Idzikowski-Casey May 17, 2022
f271023
data model for unit editor now includes liths and environs internally
Idzikowski-Casey May 17, 2022
cfb93f5
add unit and edit unit dispatches
Idzikowski-Casey May 17, 2022
8a752c9
data model changes
Idzikowski-Casey May 17, 2022
10f618a
data model changes
Idzikowski-Casey May 17, 2022
617621c
if it's already a hexcode just return it
Idzikowski-Casey May 17, 2022
ecdb353
added trash button, does nothing yet
Idzikowski-Casey May 17, 2022
d2bdda4
Merge pull request #13 from UW-Macrostrat/develop
Idzikowski-Casey May 17, 2022
e462d6d
parsing code into more understandble chucks
Idzikowski-Casey May 18, 2022
8e53b48
some data processing functions to be run server side
Idzikowski-Casey May 18, 2022
a809683
major data model restructure
Idzikowski-Casey May 18, 2022
2decbb8
data model restructuring
Idzikowski-Casey May 18, 2022
bcbe130
diff className for drag cursor
Idzikowski-Casey May 18, 2022
847192f
diff className for drag cursor
Idzikowski-Casey May 18, 2022
c9045e8
no longer draggable overlay
Idzikowski-Casey May 18, 2022
63c4578
combined the component and reducer for the units view table for both …
Idzikowski-Casey May 18, 2022
cb56b32
extra prop for when on section page
Idzikowski-Casey May 18, 2022
d93958b
btn can be on bottom of collapse or top depending upon prop
Idzikowski-Casey May 18, 2022
7a2ba49
btn can be on bottom of collapse or top depending upon prop
Idzikowski-Casey May 18, 2022
a34e6b8
make new root folder in components for unit-section table
Idzikowski-Casey May 18, 2022
a477c12
tsdoc on ssr data processor
Idzikowski-Casey May 18, 2022
98174c2
separate row wrapper for drag
Idzikowski-Casey May 18, 2022
5749772
export
Idzikowski-Casey May 18, 2022
8b932b6
minimal button inbetween rows
Idzikowski-Casey May 18, 2022
7b9f577
small logic simplification
Idzikowski-Casey May 18, 2022
6596845
undid
Idzikowski-Casey May 18, 2022
90d84f4
Merge pull request #14 from UW-Macrostrat/develop
Idzikowski-Casey May 18, 2022
75424a4
style changes and type safe event
Idzikowski-Casey May 19, 2022
d0e282e
remove unused imports
Idzikowski-Casey May 19, 2022
ade852c
betwn row btn thinner with tooltip on end
Idzikowski-Casey May 19, 2022
1b01024
btn betwn rows better implementation
Idzikowski-Casey May 19, 2022
1e5aefc
styles and parsing common logic
Idzikowski-Casey May 19, 2022
a197ea0
section tables are mergable by drag and drop action
Idzikowski-Casey May 19, 2022
b49e747
Merge pull request #15 from UW-Macrostrat/develop
Idzikowski-Casey May 19, 2022
f197c46
draggable context issues
Idzikowski-Casey May 20, 2022
4d01260
first attempt at parsing out components; lots of props drilling is ki…
Idzikowski-Casey May 20, 2022
9f4857e
preliminary error boundaries in basePage
Idzikowski-Casey May 20, 2022
3a268d1
wip error handling
Idzikowski-Casey May 20, 2022
7eb449e
Merge pull request #17 from UW-Macrostrat/develop
Idzikowski-Casey May 20, 2022
0dddadb
Add some small comments to codebase
davenquinn Jun 1, 2022
d886427
dragging btn to reorder units and btngrp
Idzikowski-Casey Jun 1, 2022
a5798fe
visual for if unit was moved
Idzikowski-Casey Jun 1, 2022
4dce2bf
harder to dismiss editor
Idzikowski-Casey Jun 1, 2022
7d2e356
no selection box for dividing sections
Idzikowski-Casey Jun 1, 2022
2ae8a02
could be null
Idzikowski-Casey Jun 1, 2022
8d2f6a3
beginning changes to strat-name hierarchy editing
Idzikowski-Casey Jun 13, 2022
1b22539
WIP lith renderer for Dom and Sub
Idzikowski-Casey Jun 14, 2022
6cdc961
new sections, inRow editor, liths
Idzikowski-Casey Jun 14, 2022
79a3005
don't limit width on component, also no title, can be set by parent
Idzikowski-Casey Jun 14, 2022
81ef7b2
can pass custom itemRenderer
Idzikowski-Casey Jun 14, 2022
96eedb4
new types and nested data
Idzikowski-Casey Jun 14, 2022
6f5f584
do joins in query instead of json in db view
Idzikowski-Casey Jun 14, 2022
da09e1b
WIP; strat_name changes for editing, modal window; steer people to ch…
Idzikowski-Casey Jun 14, 2022
5ab7c6c
library change
Idzikowski-Casey Jun 15, 2022
8eefe1c
strat_name choosing in units
Idzikowski-Casey Jun 15, 2022
fe944e6
WIP strat_name hierarchy; real bad
Idzikowski-Casey Jun 16, 2022
1e70bf5
Merge branch 'develop' into code-review-comments
Idzikowski-Casey Jun 16, 2022
9941187
breadCrumbs broken out into hook
Idzikowski-Casey Jun 16, 2022
4277eeb
refactored id-fetching for routing and made data-fetching more typed
Idzikowski-Casey Jun 16, 2022
e1b194f
Merge pull request #20 from UW-Macrostrat/code-review-comments
Idzikowski-Casey Jun 16, 2022
83ebaad
bumped blueprintjs/select to 4.4.1
Idzikowski-Casey Jun 20, 2022
e828836
lith management dialog with custom querylist
Idzikowski-Casey Jun 20, 2022
75dd988
made lithMenuItem a modular component
Idzikowski-Casey Jun 20, 2022
9d28e42
onAdd and remove handlers
Idzikowski-Casey Jun 20, 2022
1256277
more descriptive placeholder
Idzikowski-Casey Jun 20, 2022
c174c02
fix width
Idzikowski-Casey Jun 20, 2022
c331a5c
remove modal editing from table, all in-row
Idzikowski-Casey Jun 20, 2022
96bb009
panel stack for strat name dialog
Idzikowski-Casey Jun 21, 2022
c14e99a
custom querylist for strat names
Idzikowski-Casey Jun 21, 2022
a733918
dialog now contains the panel stack
Idzikowski-Casey Jun 21, 2022
45f962b
moving around row editing state functionality
Idzikowski-Casey Jun 21, 2022
6950861
WIP simplifying row editor state
Idzikowski-Casey Jun 22, 2022
df4e5f4
WIP simplifying row editor state
Idzikowski-Casey Jun 22, 2022
a2342ca
closes #22; better state handling patterns, async runAction will be n…
Idzikowski-Casey Jun 22, 2022
182bf13
Merge pull request #23 from UW-Macrostrat/row-editor
Idzikowski-Casey Jun 22, 2022
297516e
Merge pull request #24 from UW-Macrostrat/develop
Idzikowski-Casey Jun 22, 2022
3f73853
actually filter by col_id
Idzikowski-Casey Jul 5, 2022
26d32a2
deps updates
Idzikowski-Casey Jul 5, 2022
c020dad
voronoi and new deps
Idzikowski-Casey Jul 5, 2022
26e2955
more info in strat_name dropdowns; strat_tree joins
Idzikowski-Casey Jul 15, 2022
be2b854
interval item select has more information
Idzikowski-Casey Jul 15, 2022
d5027cb
strat name editing modal and query list changes
Idzikowski-Casey Jul 16, 2022
1dfa934
changes to new-strat-name editor
Idzikowski-Casey Jul 16, 2022
bd9deee
add new strat_name in querylist
Idzikowski-Casey Jul 16, 2022
69dadfe
enhanced description of sourcing of strat names
Idzikowski-Casey Jul 20, 2022
e06c950
simplified unit editor model structure
Idzikowski-Casey Jul 20, 2022
62fb6ed
source tag
Idzikowski-Casey Jul 20, 2022
f835699
strat-name editor stuff
Idzikowski-Casey Jul 20, 2022
555c5f5
min height
Idzikowski-Casey Jul 20, 2022
bb65f93
render all panels
Idzikowski-Casey Jul 20, 2022
0858f5b
lith proportions
Idzikowski-Casey Jul 20, 2022
3f4dd00
make strat_names to unit a many relationship based on join table
Idzikowski-Casey Jul 23, 2022
611de16
fixed table columns
Idzikowski-Casey Jul 23, 2022
bbac65e
unit db persistence
Idzikowski-Casey Jul 23, 2022
eaa4b1e
db persistence of column editing
Idzikowski-Casey Jul 24, 2022
0e583af
lith_unit data model enhanced
Idzikowski-Casey Jul 24, 2022
3580819
map stuff
Idzikowski-Casey Jul 24, 2022
2a3e051
reference suggest cleanup and don't allow point editing when a poly-g…
Idzikowski-Casey Jul 24, 2022
527568b
add new strat name panel
Idzikowski-Casey Jul 24, 2022
2f042ba
last search gets unrelated strat_names with no location information.
Idzikowski-Casey Jul 24, 2022
1b9d822
temporarily disable strat-name hierarchy
Idzikowski-Casey Jul 24, 2022
8c58d7d
start from empty column
Idzikowski-Casey Jul 25, 2022
bd1c812
persist reference on col editor
Idzikowski-Casey Jul 25, 2022
dbfa06f
strat-name modal changes
Idzikowski-Casey Jul 27, 2022
fd9d300
comments for db trigger
Idzikowski-Casey Jul 28, 2022
a5e6ce7
changed title
Idzikowski-Casey Jul 28, 2022
bd7dae8
parsed out column editor into smaller components
Idzikowski-Casey Jul 29, 2022
2fb856a
more env variables
Idzikowski-Casey Jul 29, 2022
448f274
remove row and close editor if it was empty
Idzikowski-Casey Jul 30, 2022
04fc4d1
prod build changes
Idzikowski-Casey Jul 30, 2022
c6e68a1
more envs
Idzikowski-Casey Jul 30, 2022
ff58d86
Update package lock
davenquinn Nov 24, 2022
afa2bba
Fix column groups select
davenquinn Nov 24, 2022
81610ed
Fix column rendering
davenquinn Nov 25, 2022
77d224b
Fixed some basics
davenquinn Nov 25, 2022
ed4ff65
Harmonized column data fetching
davenquinn Nov 25, 2022
1552d59
Updated unit/strat name loading
davenquinn Nov 25, 2022
745cbfa
Updated name of ui-components dependency
davenquinn Nov 25, 2022
b9100a9
Move to a new version of web-components with PnP support
davenquinn Nov 25, 2022
1cf7df4
Updated lock files etc.
davenquinn Nov 26, 2022
6e7ea5f
Successful install with yarn pnp
davenquinn Nov 26, 2022
b9c9aa4
Installs well with PnP but doesn't compile
davenquinn Nov 26, 2022
3332234
Compiles successfully with Yarn PnP
davenquinn Dec 29, 2022
9200d95
Updated installation instructions
davenquinn Dec 29, 2022
00616aa
Further update dependencies
davenquinn Dec 30, 2022
53f1e7e
Merge branch 'yarn-pnp' into dev-next
davenquinn Dec 30, 2022
53dd072
Merge branch 'dev-next' into develop
davenquinn Dec 30, 2022
1ded8cd
Merge pull request #26 from UW-Macrostrat/develop
davenquinn Jun 4, 2024
091e1bd
Merge remote-tracking branch 'column-builder/column-builder' into col…
davenquinn Jul 19, 2024
fe1eb07
Removed web components submodule
davenquinn Jul 19, 2024
253a68c
Moved column-builder to subdirectory
davenquinn Jul 19, 2024
54b9f98
Make column builder package installable
davenquinn Jul 19, 2024
0c420ec
Column app mostly compiles with Next JS
davenquinn Jul 20, 2024
5a4b8ba
Merge branch 'column-builder-integrate' into column-builder
davenquinn Jul 20, 2024
a081c92
Merge branch 'main' into column-builder
davenquinn Jul 24, 2024
157bdd8
Moved column builder start page to vike
davenquinn Jul 24, 2024
041b686
Column builder homepage renders mostly correctly
davenquinn Jul 24, 2024
786cb95
Some fixes to table
davenquinn Jul 24, 2024
5caa292
Started migrating column groups, but hit database error
davenquinn Jul 24, 2024
2823606
Merge branch 'main' into column-builder
davenquinn Jul 25, 2024
6b0f96a
Started to work on column group pages
davenquinn Jul 30, 2024
3ed09f4
Merge branch 'main' into column-builder
davenquinn Jul 31, 2024
79c5ccc
Updated column editing routes
davenquinn Jul 31, 2024
54103d8
Moved pages into column builder subsection
davenquinn Jul 31, 2024
be7b13d
Updated all pages to Vike design
davenquinn Jul 31, 2024
c48194d
Started updating column pages
davenquinn Jul 31, 2024
91a6374
Convert scss file to sass
davenquinn Jul 31, 2024
5b00b9c
Updated unit section table
davenquinn Jul 31, 2024
ce9ed53
Merge remote-tracking branch 'origin/main' into column-builder
davenquinn Aug 1, 2024
33dccd8
Fixed data provision
davenquinn Aug 1, 2024
2303d19
Merge branch 'main' into column-builder
davenquinn Nov 6, 2024
2f50163
Updated view signature
davenquinn Nov 7, 2024
86fd9d9
Use new col_section_data route.
davenquinn Nov 7, 2024
2e91bd6
Move app to /dev/column-editor prefix
davenquinn Nov 7, 2024
0545c23
Merge branch 'main' into column-builder
davenquinn Nov 16, 2024
c326dfe
Start fixing client routing in column editor application
davenquinn Nov 16, 2024
0ed2ba1
Updated column builder routing
davenquinn Nov 17, 2024
c5d2dec
Slight updates to column editor views
davenquinn Nov 17, 2024
f8fc373
Put column builder behind admin authorization
davenquinn Nov 18, 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
4 changes: 4 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ packageExtensions:
dependencies:
supports-color: "*"

'@next/react-dev-overlay@*':
peerDependencies:
react: '*'

pnpFallbackMode: all

pnpMode: loose
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"@blueprintjs/table": "^5.1.4",
"@lagunovsky/redux-react-router": "^3.2.0",
"@loadable/component": "^5.14.1",
"@macrostrat-web/column-builder": "workspace:*",
"@macrostrat-web/globe": "workspace:*",
"@macrostrat-web/lithology-hierarchy": "workspace:*",
"@macrostrat-web/map-utils": "workspace:*",
Expand Down
3 changes: 3 additions & 0 deletions packages/column-builder/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "next/core-web-vitals"
}
44 changes: 44 additions & 0 deletions packages/column-builder/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
_node_modules
# dependencies
/node_modules
/.pnp
.pnp.js

.yarn/cache
.yarn/install-state.gz
.yarn/unplugged

.pnp*

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env.local
.env.development.local
.env.test.local
.env.production.local
.env.production
.env.development
# vercel
.vercel

# typescript
*.tsbuildinfo
33 changes: 33 additions & 0 deletions packages/column-builder/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
This web application is based on [Next.js](https://nextjs.org/) and installed using Yarn PnP.


## Getting Started

**You should use Yarn (>v2), not NPM, to install this application.
Everything is set up for "Plug'n'Play" modules.**

1. Install modules: `yarn`
2. Run the development server: `yarn run dev`.

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

You can start editing the page by modifying `pages/index.tsx`. The page auto-updates as you edit the file.

[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.ts`.

The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages.

## Learn More

To learn more about Next.js, take a look at the following resources:

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

## Deploy on Vercel

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
8 changes: 8 additions & 0 deletions packages/column-builder/__archive/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Dockerfile
.dockerignore
node_modules
npm-debug.log
README.md
.next
docker
.git
14 changes: 14 additions & 0 deletions packages/column-builder/__archive/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM node:14.19

WORKDIR /app/dacite

COPY package*.json ./
COPY deps/web-components/packages/ui-components/package.json ./deps/web-components/packages/ui-components/
COPY deps/web-components/packages/form-components/package.json ./deps/web-components/packages/form-components/
COPY deps/web-components/packages/data-components/package.json ./deps/web-components/packages/data-components/

RUN npm install

EXPOSE 1234

CMD ["npm", "run", "dev"]
30 changes: 30 additions & 0 deletions packages/column-builder/__archive/prod.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM node:16-alpine AS builder

WORKDIR /app/
COPY . .

RUN npm install

# This will do the trick, use the corresponding env file for each environment.
COPY ./.env.production .

RUN npm run build

# 3. Production image, copy all the files and run next
FROM node:16-alpine AS runner
WORKDIR /app/

ENV NODE_ENV=production

# # You only need to copy next.config.js if you are NOT using the default configuration
COPY --from=builder /app/.env.production ./
COPY --from=builder /app/next.config.js ./
COPY --from=builder /app/package.json ./package.json
COPY --from=builder /app/node_modules ./node_modules
COPY --from=builder /app/.next ./.next

EXPOSE 1234

ENV PORT 1234

CMD ["npm", "run", "start"]
11 changes: 11 additions & 0 deletions packages/column-builder/env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## place this into an .env.development file in this directory!!
NEXT_PUBLIC_SERVER_URL=http://localhost:3001
NEXT_PUBLIC_CLIENT_URL=http://localhost:3001
NEXT_PUBLIC_TOPOLOGY_URL=http://localhost:1235
NEXT_PUBLIC_BASE_URL=

## .env.production
NEXT_PUBLIC_SERVER_URL=http://postgrest:3001
NEXT_PUBLIC_CLIENT_URL=http://localhost:3001
NEXT_PUBLIC_TOPOLOGY_URL=http://localhost:1235
NEXT_PUBLIC_BASE_URL=/dacite
5 changes: 5 additions & 0 deletions packages/column-builder/next-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
48 changes: 48 additions & 0 deletions packages/column-builder/next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/** @type {import('next').NextConfig} */
const path = require("path");

const packageSrc = (name) =>
path.resolve(
__dirname,
"..",
"..",
"deps",
"web-components",
"packages",
name,
"src"
);

const nextConfig = {
assetPrefix: process.env.NEXT_PUBLIC_BASE_URL,
basePath: process.env.NEXT_PUBLIC_BASE_URL,
typescript: {
ignoreBuildErrors: true,
},
reactStrictMode: true,
transpilePackages: [
"@macrostrat/form-components",
"@macrostrat/data-components",
"@macrostrat/ui-components",
"@macrostrat/column-components",
],
webpack: (config, options) => {
return {
...config,

resolve: {
...config.resolve,
alias: {
...config.resolve.alias,
"~": path.resolve(__dirname, "src"),
"@macrostrat/form-components": packageSrc("form-components"),
"@macrostrat/data-components": packageSrc("data-components"),
"@macrostrat/ui-components": packageSrc("ui-components"),
"@macrostrat/column-components": packageSrc("column-components"),
},
},
};
},
};

module.exports = nextConfig;
39 changes: 39 additions & 0 deletions packages/column-builder/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "@macrostrat-web/column-builder",
"scripts": {
"dev": "next dev -p 1234",
"build": "next build",
"start": "next start -p 1234",
"lint": "next lint"
},
"module": "src/index.ts",
"dependencies": {
"@blueprintjs/core": "^5.10.5",
"@blueprintjs/icons": "^5.10.0",
"@blueprintjs/popover2": "^1.2.1",
"@blueprintjs/select": "^5.2.1",
"@macrostrat-web/settings": "workspace:*",
"@macrostrat/column-components": "workspace:*",
"@macrostrat/data-components": "workspace:*",
"@macrostrat/form-components": "workspace:*",
"@macrostrat/hyper": "^2.0.1",
"@macrostrat/ui-components": "workspace:*",
"@mapbox/mapbox-gl-draw": "^1.3.0",
"@supabase/postgrest-js": "^0.36.0",
"@types/mapbox__mapbox-gl-draw": "^1.2.3",
"axios": "^0.27.2",
"cross-fetch": "^3.1.5",
"mapbox-gl": "^2.8.2",
"react": "^18",
"react-beautiful-dnd": "^13.1.0",
"react-color": "^2.19.3"
},
"devDependencies": {
"@types/node": "^17.0.10",
"@types/react": "^17",
"@types/react-beautiful-dnd": "^13.1.2",
"eslint": "^8.7.0",
"eslint-config-next": "^12.0.8",
"typescript": "^4.5.4"
}
}
10 changes: 10 additions & 0 deletions packages/column-builder/src/components/buttons/btns.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.flat-btn {
padding: 0 10px;
min-height: 0;
}

.position-increment-container {
display: flex;
justify-content: center;
align-items: center;
}
Loading