NextJS

app/.gitlab-ci.yml

@@ -19,19 +19,21 @@ variables:
   BACKEND_RELEASE_TAG: $CI_REGISTRY_IMAGE/backend:latest
   MEDIA_RELEASE_TAG: $CI_REGISTRY_IMAGE/media:latest
   PROMETHEUS_RELEASE_TAG: $CI_REGISTRY_IMAGE/prometheus:latest
+  WEB_DEV_RELEASE_TAG: $CI_REGISTRY_IMAGE/web-dev:latest
   WEB_RELEASE_TAG: $CI_REGISTRY_IMAGE/web:latest
+  WEB_NEXT_RELEASE_TAG: $CI_REGISTRY_IMAGE/web-next:latest
   MOBILE_APP_RELEASE_TAG: $CI_REGISTRY_IMAGE/mobile-app:latest
   MOBILE_APP_PREVIEW_RELEASE_TAG: $CI_REGISTRY_IMAGE/mobile-app:current-preview
-  WEB_NEXT_RELEASE_TAG: $CI_REGISTRY_IMAGE/web-next:latest
   SLUG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
   PROXY_TAG: $CI_REGISTRY_IMAGE/proxy:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
   NGINX_TAG: $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
   NGINX_NEXT_TAG: $CI_REGISTRY_IMAGE/nginx-next:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
   BACKEND_TAG: $CI_REGISTRY_IMAGE/backend:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
   MEDIA_TAG: $CI_REGISTRY_IMAGE/media:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
   WEB_TAG: $CI_REGISTRY_IMAGE/web:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
-  MOBILE_APP_TAG: $CI_REGISTRY_IMAGE/mobile-app:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+  WEB_DEV_TAG: $CI_REGISTRY_IMAGE/web-dev:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
   WEB_NEXT_TAG: $CI_REGISTRY_IMAGE/web-next:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+  MOBILE_APP_TAG: $CI_REGISTRY_IMAGE/mobile-app:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
   PROMETHEUS_TAG: $CI_REGISTRY_IMAGE/prometheus:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
 
 
@@ -130,15 +132,57 @@ build:media:
       - app/proto/**/*
       - app/media/**/*
 
+build:web-dev:
+  needs: ["protos"]
+  stage: build
+  script:
+    - docker pull $WEB_DEV_RELEASE_TAG || true
+    - docker build --build-arg version=$SLUG --cache-from $WEB_DEV_RELEASE_TAG -t $WEB_DEV_TAG -f app/web/dev.Dockerfile app/web/
+    - docker push $WEB_DEV_TAG
+    # creates a new docker container (docker create returns the container name), and copies the /app folder to the host
+    - mkdir -p artifacts && docker cp $(docker create $WEB_DEV_TAG):/app artifacts/web-dev
+  rules:
+    - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
+      changes:
+      - app/**/*
+    - if: $CI_COMMIT_BRANCH != $RELEASE_BRANCH
+      changes:
+      - app/proto/**/*
+      - app/web/**/*
+  artifacts:
+    paths:
+      - artifacts/web-dev/
+
 build:web:
   needs: ["protos"]
   stage: build
   script:
     - docker pull $WEB_RELEASE_TAG || true
-    - docker build --build-arg version=$SLUG --cache-from $WEB_RELEASE_TAG -t $WEB_TAG app/web/
+    - docker build --build-arg version=$SLUG --cache-from $WEB_RELEASE_TAG -t $WEB_TAG -f app/web/prod.Dockerfile app/web/
     - docker push $WEB_TAG
     # creates a new docker container (docker create returns the container name), and copies the /app folder to the host
-    - mkdir -p artifacts && docker cp $(docker create $WEB_TAG):/app/build artifacts/web
+    - mkdir -p artifacts && docker cp $(docker create $WEB_TAG):/app artifacts/web
+  rules:
+    - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
+      changes:
+      - app/**/*
+    - if: $CI_COMMIT_BRANCH != $RELEASE_BRANCH
+      changes:
+      - app/proto/**/*
+      - app/web/**/*
+  artifacts:
+    paths:
+      - artifacts/web/
+
+build:web-next:
+  needs: ["protos"]
+  stage: build
+  script:
+    - docker pull $WEB_NEXT_RELEASE_TAG || true
+    - docker build --build-arg version=$SLUG --build-arg environment=preview --cache-from $WEB_NEXT_RELEASE_TAG -t $WEB_NEXT_TAG -f app/web/prod.Dockerfile app/web/
+    - docker push $WEB_NEXT_TAG
+    # creates a new docker container (docker create returns the container name), and copies the /app folder to the host
+    - mkdir -p artifacts && docker cp $(docker create $WEB_NEXT_TAG):/app artifacts/web
   rules:
     - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
       changes:
@@ -183,29 +227,6 @@ build:nginx-next:
       - app/proto/**/*
       - app/nginx/**/*
 
-build:web-next:
-  needs: ["protos"]
-  stage: build
-  script:
-    - docker pull $WEB_RELEASE_TAG || true
-    # this is a bit hacky, but I don't see any other good way to get the preview env vars into the container
-    - cp app/web/.env.preview app/web/.env.production
-    - docker build --build-arg version=$SLUG-next --cache-from $WEB_RELEASE_TAG -t $WEB_NEXT_TAG app/web/
-    - docker push $WEB_NEXT_TAG
-    # creates a new docker container (docker create returns the container name), and copies the /app folder to the host
-    - mkdir -p artifacts && docker cp $(docker create $WEB_NEXT_TAG):/app/build artifacts/web-next
-  rules:
-    - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
-      changes:
-      - app/**/*
-    - if: $CI_COMMIT_BRANCH != $RELEASE_BRANCH
-      changes:
-      - app/proto/**/*
-      - app/web/**/*
-  artifacts:
-    paths:
-      - artifacts/web-next/
-
 test:backend:
   needs: ["build:backend"]
   stage: test
@@ -275,9 +296,9 @@ test:media:
       - app/media/**/*
 
 test:web:
-  needs: ["build:web"]
+  needs: ["build:web-dev"]
   stage: test
-  image: $WEB_TAG
+  image: $WEB_DEV_TAG
   inherit:
     # no docker login
     default: false
@@ -323,9 +344,9 @@ test:mobile:
       - app/mobile/**/*
 
 test:web-prettier:
-  needs: ["build:web"]
+  needs: ["build:web-dev"]
   stage: test
-  image: $WEB_TAG
+  image: $WEB_DEV_TAG
   inherit:
     # no docker login
     default: false
@@ -359,9 +380,9 @@ test:mobile-prettier:
       - app/mobile/**/*
 
 test:storybook:
-  needs: ["build:web-next"]
+  needs: ["build:web-dev"]
   stage: test
-  image: $WEB_NEXT_TAG
+  image: $WEB_DEV_TAG
   inherit:
     # no docker login
     default: false
@@ -380,35 +401,6 @@ test:storybook:
       - app/proto/**/*
       - app/web/**/*
 
-test:web-next:
-  needs: ["build:web-next"]
-  stage: test
-  image: $WEB_NEXT_TAG
-  inherit:
-    # no docker login
-    default: false
-  script:
-    - cd /app && yarn test-ci
-  after_script:
-    - cp /app/junit.xml $CI_PROJECT_DIR/
-    - cp /app/coverage/cobertura-coverage.xml $CI_PROJECT_DIR/
-    - mkdir -p $CI_PROJECT_DIR/artifacts/lcov-report && cp -a /app/coverage/lcov-report $CI_PROJECT_DIR/artifacts/
-  coverage: '/^All files[^|]*\|[^|]*\s+([\d\.]+)/'
-  artifacts:
-    reports:
-      cobertura: cobertura-coverage.xml
-      junit: junit.xml
-    paths:
-      - artifacts/lcov-report
-  rules:
-    - if: ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH == $RELEASE_BRANCH)
-      changes:
-      - app/**/*
-    - if: ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH != $RELEASE_BRANCH)
-      changes:
-      - app/proto/**/*
-      - app/web/**/*
-
 preview:bcov:
   needs: ["test:backend"]
   stage: preview
@@ -432,7 +424,7 @@ preview:bcov:
       - app/backend/**/*
 
 preview:wcov:
-  needs: ["test:web-next"]
+  needs: ["test:web"]
   stage: preview
   image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
   inherit:
@@ -475,28 +467,6 @@ preview:storybook:
       - app/proto/**/*
       - app/web/**/*
 
-preview:web-next:
-  needs: ["build:web-next"]
-  stage: preview
-  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
-  inherit:
-    # no docker login
-    default: false
-  script:
-    - aws s3 rm s3://$AWS_PREVIEW_BUCKET/web/$CI_COMMIT_SHORT_SHA/ --recursive
-    - aws s3 cp artifacts/web-next s3://$AWS_PREVIEW_BUCKET/web/$CI_COMMIT_SHORT_SHA/ --recursive
-    - aws s3 rm s3://$AWS_PREVIEW_BUCKET/web/$CI_COMMIT_REF_SLUG/ --recursive
-    - aws s3 cp artifacts/web-next s3://$AWS_PREVIEW_BUCKET/web/$CI_COMMIT_REF_SLUG/ --recursive
-    - echo "Done, preview available at https://$CI_COMMIT_SHORT_SHA--web.$PREVIEW_DOMAIN/ and https://$CI_COMMIT_REF_SLUG--web.$PREVIEW_DOMAIN/"
-  rules:
-    - if: ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH == $RELEASE_BRANCH)
-      changes:
-      - app/**/*
-    - if: ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH != $RELEASE_BRANCH)
-      changes:
-      - app/proto/**/*
-      - app/web/**/*
-
 preview:mobile:
   needs: ["test:mobile"]
   stage: preview
@@ -583,36 +553,23 @@ release:media:
       changes:
       - app/**/*
 
-release:web:
+release:web-dev:
   stage: release
   script:
-    - docker pull $WEB_TAG
-    - docker tag $WEB_TAG $WEB_RELEASE_TAG
-    - docker push $WEB_RELEASE_TAG
+    - docker pull $WEB_DEV_TAG
+    - docker tag $WEB_DEV_TAG $WEB_DEV_RELEASE_TAG
+    - docker push $WEB_DEV_RELEASE_TAG
   rules:
     - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
       changes:
       - app/**/*
 
-release:web-sourcemaps:
-  stage: release
-  image: $WEB_TAG
-  inherit:
-    # no docker login
-    default: false
-  script:
-    - cd /app && SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN yarn upload-sourcemap
-  rules:
-    - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
-      changes:
-      - app/**/*
-
-release:nginx-next:
+release:web:
   stage: release
   script:
-    - docker pull $NGINX_NEXT_TAG
-    - docker tag $NGINX_NEXT_TAG $NGINX_NEXT_RELEASE_TAG
-    - docker push $NGINX_NEXT_RELEASE_TAG
+    - docker pull $WEB_TAG
+    - docker tag $WEB_TAG $WEB_RELEASE_TAG
+    - docker push $WEB_RELEASE_TAG
   rules:
     - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
       changes:
@@ -624,21 +581,31 @@ release:web-next:
     - docker pull $WEB_NEXT_TAG
     - docker tag $WEB_NEXT_TAG $WEB_NEXT_RELEASE_TAG
     - docker push $WEB_NEXT_RELEASE_TAG
+    # some command to get our preview server to redeploy?
   rules:
     - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
       changes:
       - app/**/*
 
-release:next-deploy:
+release:web-sourcemaps:
   stage: release
-  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
+  image: $WEB_TAG
   inherit:
     # no docker login
     default: false
   script:
-    - aws s3 sync artifacts/web-next/ s3://$AWS_NEXT_BUCKET --delete --acl public-read
-    - aws cloudfront create-invalidation --distribution-id $AWS_NEXT_CF_DISTRIBUTIN_ID --paths "/*"
-    - echo "Done, next web deployed to https://$AWS_NEXT_BUCKET/"
+    - cd /app && SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN yarn upload-sourcemap
+  rules:
+    - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
+      changes:
+      - app/**/*
+
+release:nginx-next:
+  stage: release
+  script:
+    - docker pull $NGINX_NEXT_TAG
+    - docker tag $NGINX_NEXT_TAG $NGINX_NEXT_RELEASE_TAG
+    - docker push $NGINX_NEXT_RELEASE_TAG
   rules:
     - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
       changes:

app/backend/src/couchers/urls.py

@@ -23,15 +23,15 @@ def edit_profile_link():
 
 
 def signup_link(token):
-    return f"{config['BASE_URL']}/signup/{token}"
+    return f"{config['BASE_URL']}/signup?token={token}"
 
 
 def login_link(login_token):
-    return f"{config['BASE_URL']}/login/{login_token}"
+    return f"{config['BASE_URL']}/login?token={login_token}"
 
 
 def password_reset_link(password_reset_token):
-    return f"{config['BASE_URL']}/password-reset/{password_reset_token}"
+    return f"{config['BASE_URL']}/complete-password-reset?token={password_reset_token}"
 
 
 def host_request_link_host():
@@ -63,7 +63,7 @@ def media_upload_url(path):
 
 
 def change_email_link(confirmation_token):
-    return f"{config['BASE_URL']}/confirm-email/{confirmation_token}"
+    return f"{config['BASE_URL']}/confirm-email?token={confirmation_token}"
 
 
 def donation_cancelled_url():

app/backend/src/tests/test_email.py

@@ -304,8 +304,8 @@ def test_email_changed_confirmation_sent_to_old_email(db):
     assert user.new_email in html
     assert "via a similar email sent to your new email address" in plain
     assert "via a similar email sent to your new email address" in html
-    assert f"{config['BASE_URL']}/confirm-email/{confirmation_token}" in plain
-    assert f"{config['BASE_URL']}/confirm-email/{confirmation_token}" in html
+    assert f"{config['BASE_URL']}/confirm-email?token={confirmation_token}" in plain
+    assert f"{config['BASE_URL']}/confirm-email?token={confirmation_token}" in html
     assert "[email protected]" in plain
     assert "[email protected]" in html
 
@@ -328,8 +328,8 @@ def test_email_changed_confirmation_sent_to_new_email(db):
     assert user.email in html
     assert "via a similar email sent to your old email address" in plain
     assert "via a similar email sent to your old email address" in html
-    assert f"{config['BASE_URL']}/confirm-email/{confirmation_token}" in plain
-    assert f"{config['BASE_URL']}/confirm-email/{confirmation_token}" in html
+    assert f"{config['BASE_URL']}/confirm-email?token={confirmation_token}" in plain
+    assert f"{config['BASE_URL']}/confirm-email?token={confirmation_token}" in html
     assert "[email protected]" in plain
     assert "[email protected]" in html
 
@@ -350,8 +350,8 @@ def test_password_reset_email(db):
         unique_string = "You asked for your password to be reset on Couchers.org."
         assert unique_string in plain
         assert unique_string in html
-        assert f"{config['BASE_URL']}/password-reset/{password_reset_token.token}" in plain
-        assert f"{config['BASE_URL']}/password-reset/{password_reset_token.token}" in html
+        assert f"{config['BASE_URL']}/complete-password-reset?token={password_reset_token.token}" in plain
+        assert f"{config['BASE_URL']}/complete-password-reset?token={password_reset_token.token}" in html
         assert "[email protected]" in plain
         assert "[email protected]" in html
 

app/docker-compose.prod.yml

@@ -62,6 +62,7 @@ services:
     networks:
       - media_nginx
       - envoy_nginx
+      - web_nginx
   prometheus:
     image: registry.gitlab.com/couchers/couchers/prometheus
     restart: always
@@ -70,6 +71,13 @@ services:
       - backend
     networks:
       - backend_prometheus
+  web:
+    image: registry.gitlab.com/couchers/couchers/web
+    restart: always
+    expose:
+      - 3000
+    networks:
+      - web_nginx
 
 networks:
   backend_prometheus:
@@ -84,3 +92,5 @@ networks:
     driver: bridge
   envoy_nginx:
     driver: bridge
+  web_nginx:
+    driver: bridge