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

[FEATURE] add anchor point (left/center/right) + sign hanging mode (recto/verso) #118

Merged
merged 32 commits into from
Nov 22, 2023
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c3363eb
[FEATURE] add anchor point (left/center/right) + sign hanging mode (r…
3nids Aug 31, 2023
9d1ddae
update sign + fix ordering
3nids Sep 8, 2023
4c82e87
signal 5.01 without units
Nov 2, 2023
1bf69f4
add second photo to attribute form support
Nov 2, 2023
bf84773
expression for official signals list corrected with locale
Nov 2, 2023
0aa49b3
add arm image + fix pip usage
3nids Nov 7, 2023
6341a7a
add more demo
3nids Nov 8, 2023
59fbb72
fix sign side
3nids Nov 13, 2023
08581c3
create virtual signs for verso with azimut+180
3nids Nov 13, 2023
df53588
rename ordering_by_anchor_point to group_by_anchor_point
3nids Nov 14, 2023
e86637d
fix demo
3nids Nov 14, 2023
9e2a897
further fixes to view
3nids Nov 14, 2023
c87a816
azimuts list
3nids Nov 14, 2023
040f864
positive azimut
3nids Nov 14, 2023
106303d
fix
3nids Nov 14, 2023
0b1c191
json with path
3nids Nov 15, 2023
b227758
temp
3nids Nov 15, 2023
386f56b
sort
3nids Nov 15, 2023
d17871c
current state with function
3nids Nov 21, 2023
844e2c1
drop block function
3nids Nov 21, 2023
ac3130a
add manual offsets for azimuts
3nids Nov 21, 2023
705200e
second photo for support
Oct 4, 2023
e4b9730
add options to define PG port in run-docker.sh
3nids Nov 22, 2023
a7fc57e
Merge remote-tracking branch 'origin/master' into anchor-point
3nids Nov 22, 2023
33d1d9e
fix tests
3nids Nov 22, 2023
02673e3
fix image test
3nids Nov 22, 2023
f91815f
add missing delta
3nids Nov 22, 2023
5dbecde
migration file user_signs image added
Nov 22, 2023
24279ce
changelog file user_signs_img
Nov 22, 2023
16d96d4
add pre-commit ci
3nids Nov 22, 2023
43ce63d
complete aliases in form
Nov 22, 2023
3e14644
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 22, 2023
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
Prev Previous commit
Next Next commit
add options to define PG port in run-docker.sh
3nids committed Nov 22, 2023
commit e4b973056d0d8ce2bb0280d8d30020870be4a37c
4 changes: 4 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Copy this file to .env
# ----------------------
# Define POSTGRES PORT for Docker when calling datamodel/scripts/run-docker.sh
SIGNALO_PG_PORT=5432
18 changes: 8 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
.env
project/images/_*
project/this-is-the-way.jpg
project/signalo.ts
project/signalo_attachments.zip
website/tx
website/local.html

.idea
.DS_Store
*.orig
@@ -12,13 +20,3 @@ official-signs.json
postgresql.jar
schemaspy*.jar
schemaspy/
website/local.html
project/this-is-the-way.jpg
project/signalo.ts
project/signalo_attachments.zip
website/tx
Pipfile
Pipfile.lock
.env
Pipfile
project/images/_*
30 changes: 25 additions & 5 deletions scripts/run-docker.sh
Original file line number Diff line number Diff line change
@@ -2,27 +2,47 @@

set -e

# load env vars
# https://stackoverflow.com/a/20909045/1548052
export $(grep -v '^#' .env | xargs)

BUILD=0
DEMO_DATA=0
SIGNALO_PG_PORT=${TWW_PG_PORT:-5432}

while getopts 'b' opt; do
while getopts 'bdp:' opt; do
case "$opt" in
b)
echo "Processing option 'a'"
echo "Rebuild docker image"
BUILD=1
;;

d)
echo "Load demo data"
DEMO_DATA=1
;;

p)
echo "Overriding PG port to ${OPTARG}"
TWW_PG_PORT=${OPTARG}
;;


?|h)
echo "Usage: $(basename $0) [-b]"
echo "Usage: $(basename $0) [-bd] [-p PG_PORT]"
exit 1
;;
esac
done
shift "$(($OPTIND -1))"

if [[ $BUILD -eq 1 ]]; then
docker build -f .docker/Dockerfile --tag opengisch/signalo .
fi

docker rm -f signalo || true
docker run -d -p 5433:5432 -v $(pwd):/src --name signalo opengisch/signalo -c log_statement=all
docker run -d -p ${SIGNALO_PG_PORT}:5432 -v $(pwd):/src --name signalo opengisch/signalo -c log_statement=all
docker exec signalo init_db.sh wait
docker exec signalo init_db.sh build -d
if [[ $DEMO_DATA -eq 1 ]]; then
docker exec signalo init_db.sh build -d
fi