Skip to content

Commit

Permalink
Added prototype for locaction element (#6)
Browse files Browse the repository at this point in the history
* code prototyping, not compiling

* further prototyping

* finished prototyping; time to iron out bugs

* prototype editable list compiling but untested

* starting work on InstitutionPolicy form

* incremental work on InstitutionPolicy form, need SmallBounded Boolean

* InstitutionPolicy form compiling but untested

* InstitutionPolicy form working, but delete button only deletes itself

* adding some debug info

* fixed deletion

* incremental work on add; noticed delete doesn't work with one click if starting delete from bottom

* added menuSignal and institution contact+name inputs

* minor refactor using labelSig'

* added url fields to location

* added checkbox (versioning)

* added accumulateIdent; prototyped textFilter; need to debug propagation and several minor issues

* added fixme note, minor reorg

* very minor debugging

* fixed a few occurrences of labelSig' misuse

* fixed handling of empty strings

* Updating deps, restructuring project so the app is now at repo root; disabled one minfier for now

* adding debug docs

* fixed an issue with form text not persisting state properly

* very minor: show step is not recursive

* incremental work on removing Keep/Delete

* incremental work on arrayView: need another layer of Maybe

* adding (possibly) more conveient wrapper for array items

* adding and removing items from list now working, but content not saved

* fixed issue with policy not being propagated; added extensive logging for location

* actively debugging loopS usage for Options

* converting to control signals, but noticed an issue with Option.set

* switched to using custom fork of purescript-option (for now); setMay now works

* broken: working on adding nested options

* fixed nested options usage; seems slower

* minor fix: versioning

* fixed institution policies by making it a CtrlSignal
However, now institutionSustainability is broken or needs to be fixed

* Location now rendering!

* cleanup: imports and logging

* broken: debugging error handdling for urlInput

* fixed sustain error reporting

* adding some minor css fixes
  • Loading branch information
bbarker authored Oct 9, 2019
1 parent 090ce07 commit 14b4c7a
Show file tree
Hide file tree
Showing 50 changed files with 1,027 additions and 447 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ generated-docs/
.psa*
.spago/

app/prod/
!app/prod/css
prod/
prod/css

test/index.js
tests/index.js
tests/prod/

# Temp files:
*~
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ before_script:
- chmod a+w -R .

script:
- IMG_VER=0.13.0_r1 ./scripts/dist_build.sh
- IMG_VER=0.13.3_r1 ./scripts/dist_build.sh

deploy:
provider: pages
local_dir: app/dist
local_dir: dist
target_branch: gh-pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,20 @@ Web tools to display

# Building

If you have the relevant build tools intalled (npm, spago, pulp, etc.), you can
build using `npm run build && npm run prod`. For a more convient approach, see
the section on Docker below, and for complete build commands used in CI, see
`scripts/dist_build_commands.sh`.

## Docker

* Run `./psc.sh <command>`, e.g. `./psc.sh pulp --psc-package build`. This will run
the command in the container with the CWD mounted and then exit. Alternatively
if you want to issue multiple commands in the container quickly, you can
run `./psc.sh bash`.

## Debugging

For an unminified build that is easier to debug from the browser, use
`npm run debug` instead of `npm run prod`.

120 changes: 0 additions & 120 deletions app/src/Metajelo/FormUtil.purs

This file was deleted.

90 changes: 0 additions & 90 deletions app/src/Metajelo/UI.purs

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ html {
box-sizing: border-box;
}

body {
font-size: 14px;
line-height: 1.8;
}

input {
margin-right: 5px;
}
/* -----------------------------------------------------------------------------
ROOT ELEMENTS
Expand Down
File renamed without changes.
Loading

0 comments on commit 14b4c7a

Please sign in to comment.