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

Staging #1647

Draft
wants to merge 39 commits into
base: develop
Choose a base branch
from
Draft

Staging #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6a49480
- reviewed prerprint converter
Aug 15, 2022
f508427
update dependencies
Aug 15, 2022
1a67c6a
- update composer dependencies
Aug 16, 2022
fa16cd8
add hero banner to the home page
Aug 19, 2022
4a2b753
add hero banner to the home page
Aug 19, 2022
58adca8
Clean up
Aug 19, 2022
d6d0b49
Remove hero-banner-item, and merged two classes in HeroBanner.
Aug 24, 2022
92ac099
Refactor the code, add acceptance tests
Aug 25, 2022
5b18de5
- Remove Carousel
Aug 25, 2022
969621e
- Modify unittests
Aug 25, 2022
062cbd9
fix a minor bug and clean up the code
Aug 26, 2022
dcbcc80
Update dependencies, make author and image optional
Aug 29, 2022
d973377
Modify Behat tests
Aug 29, 2022
649dcea
The ImpactStatement can be null
Aug 31, 2022
da5eb50
Revert "add hero banner to the home page"
Aug 31, 2022
a2339b1
Modify tests to accept search version 2
Aug 31, 2022
7325415
Add PDF format, and minor improvements
Aug 31, 2022
e34f91f
Modify behat tests
Aug 31, 2022
e89487d
Merge branch 'develop' into feature/hero-banner
Aug 31, 2022
7aba7a3
fix cs
Aug 31, 2022
84b82d1
Merge branch 'develop' into feature/reviewed-preprint
Aug 31, 2022
6d0969f
update dependencies
Sep 1, 2022
2df213f
Merge branch 'feature/hero-banner' into staging
Sep 1, 2022
96a54b5
update composer.json
Sep 1, 2022
bf34222
update composer.lock
Sep 1, 2022
9b0c704
Attempt to force use of demo—api-dummy
nlisgo Sep 1, 2022
04263be
Merge branch 'staging' of github.com:elifesciences/journal into staging
nlisgo Sep 1, 2022
1c7e1ac
Temporarily disable tests
nlisgo Sep 1, 2022
f0ace38
only run one phpunit test
nlisgo Sep 1, 2022
f8522ea
Switch to contact
nlisgo Sep 1, 2022
8bad34e
Increase timeout thresholds
nlisgo Sep 1, 2022
73ec6b9
Fix a minor bug
Sep 2, 2022
e831310
Merge branch 'feature/reviewed-preprint' into staging
Sep 2, 2022
8530cba
fix links for article hero-banner
Sep 2, 2022
3636e87
Merge branch 'feature/hero-banner' into staging
Sep 2, 2022
3e28e61
enable debug on staging
Sep 2, 2022
781a3ef
Revert "enable debug on staging"
Sep 2, 2022
8755e34
enable debug on staging
Sep 2, 2022
bc504ae
Revert "enable debug on staging"
Sep 2, 2022
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
2 changes: 1 addition & 1 deletion .ci/behat
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ set -e

export JARNAIZ_JUNIT_OUTPUTDIR=build/ci/behat
rm -rf "$JARNAIZ_JUNIT_OUTPUTDIR" && mkdir -p "$JARNAIZ_JUNIT_OUTPUTDIR"
vendor/bin/behat --list-scenarios --tags '~wip' | vendor/bin/fastest --no-interaction --process 8 "JARNAIZ_JUNIT_FILENAME={n}.xml JOURNAL_INSTANCE=behat{p} vendor/bin/behat --strict --format junit {};"
vendor/bin/behat --list-scenarios --tags '@contact' | vendor/bin/fastest --no-interaction --process 8 "JARNAIZ_JUNIT_FILENAME={n}.xml JOURNAL_INSTANCE=behat{p} vendor/bin/behat --strict --format junit {};"
2 changes: 1 addition & 1 deletion .ci/phpunit
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ set -e

export FASTEST_OUTPUT_DIR=build/ci/phpunit
rm -rf "$FASTEST_OUTPUT_DIR" && mkdir -p "$FASTEST_OUTPUT_DIR"
vendor/bin/fastest --no-interaction --process 4 --xml phpunit.xml.dist "JOURNAL_INSTANCE=phpunit{p} vendor/bin/phpunit --log-junit $FASTEST_OUTPUT_DIR/{n}.xml {};"
vendor/bin/fastest --no-interaction --process 4 --xml phpunit.xml.dist "JOURNAL_INSTANCE=phpunit{p} vendor/bin/phpunit --filter StatusTest::it_returns_200_pong_when_the_application_is_correctly_setup --log-junit $FASTEST_OUTPUT_DIR/{n}.xml {};"
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IMAGE_TAG=develop
APP_ENV=dev
PHP_VERSION=6ec2cc0701564355436c42b87399ab062d35b1be
NODE_VERSION=6.17.0-stretch
DEPENDENCIES_API_DUMMY=410de0c23c7744eaeb883483264f700563674d36
DEPENDENCIES_API_DUMMY=pr-204
# add '-debug' for VNC support
SELENIUM_IMAGE_SUFFIX=
JOURNAL_PORT=8080
Expand Down
8 changes: 4 additions & 4 deletions app/Resources/views/home.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

{% block body %}

{% if carousel %}

{{ render_pattern(carousel) }}

{% if heroBanner %}
<div class="wrapper">
{{ render_pattern(heroBanner) }}
</div>
{% endif %}

<div class="wrapper">
Expand Down
8 changes: 4 additions & 4 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ csa_guzzle:
clients:
elife_api:
config:
base_uri: '%api_url%'
connect_timeout: '%api_connect_timeout%'
base_uri: 'https://demo--api-dummy.elifesciences.org'
connect_timeout: '%api_connect_timeout_slow%'
headers:
Authorization: '%api_key%'
timeout: '%api_timeout%'
timeout: '%api_timeout_slow%'
elife_api_slow:
config:
base_uri: '%api_url%'
base_uri: 'https://demo--api-dummy.elifesciences.org'
connect_timeout: '%api_connect_timeout_slow%'
headers:
Authorization: '%api_key%'
Expand Down
2 changes: 1 addition & 1 deletion app/config/routing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ article-type:
defaults:
_controller: AppBundle:ArticleTypes:list
requirements:
type: '(correction|editorial|feature|insight|research-advance|research-article|research-communication|retraction|registered-report|replication-study|review-article|scientific-correspondence|short-report|tools-resources)'
type: '(reviewed-preprint|correction|editorial|feature|insight|research-advance|research-article|research-communication|retraction|registered-report|replication-study|review-article|scientific-correspondence|short-report|tools-resources)'

article-version-xml:
path: /articles/{id}v{version}.xml
Expand Down
30 changes: 21 additions & 9 deletions app/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ services:
class: eLife\ApiSdk\Client\Search
factory: ['@elife.api_sdk', search]

elife.api_sdk.reviewed.preprint:
class: eLife\ApiSdk\Client\ReviewedPreprints
factory: ['@elife.api_sdk', reviewedPreprint]

elife.api_sdk.search.slow:
class: eLife\ApiSdk\Client\Search
factory: ['@elife.api_sdk.slow', search]
Expand Down Expand Up @@ -540,6 +544,17 @@ services:
tags:
- name: view_model.converter

elife.journal.view_model.converter.reviewed.preprint:
class: eLife\Journal\ViewModel\Converter\ReviewedPreprintConverter
public: false
arguments:
- '@elife.journal.view_model.converter'
- '@router'
- '@security.authorization_checker'
- '%era_articles%'
tags:
- name: view_model.converter

elife.journal.view_model.converter.article.modal:
class: eLife\Journal\ViewModel\Converter\ArticleModalConverter
public: false
Expand Down Expand Up @@ -879,12 +894,11 @@ services:
tags:
- name: view_model.converter

elife.journal.view_model.converter.cover.article.carousel_item:
class: eLife\Journal\ViewModel\Converter\CoverArticleCarouselItemConverter
elife.journal.view_model.converter.cover.article.hero_banner:
class: eLife\Journal\ViewModel\Converter\CoverArticleHeroBannerConverter
public: false
arguments:
- '@router'
- '@elife.journal.view_model.factory.carousel_item_image'
tags:
- name: view_model.converter

Expand All @@ -897,12 +911,11 @@ services:
tags:
- name: view_model.converter

elife.journal.view_model.converter.cover.blog_article.carousel_item:
class: eLife\Journal\ViewModel\Converter\CoverBlogArticleCarouselItemConverter
elife.journal.view_model.converter.cover.blog_article.hero_banner:
class: eLife\Journal\ViewModel\Converter\CoverBlogArticleHeroBannerConverter
public: false
arguments:
- '@router'
- '@elife.journal.view_model.factory.carousel_item_image'
tags:
- name: view_model.converter

Expand All @@ -915,12 +928,11 @@ services:
tags:
- name: view_model.converter

elife.journal.view_model.converter.cover.collection.carousel_item:
class: eLife\Journal\ViewModel\Converter\CoverCollectionCarouselItemConverter
elife.journal.view_model.converter.cover.collection.hero_banner:
class: eLife\Journal\ViewModel\Converter\CoverCollectionHeroBannerConverter
public: false
arguments:
- '@router'
- '@elife.journal.view_model.factory.carousel_item_image'
tags:
- name: view_model.converter

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
"composer/package-versions-deprecated": "1.11.99.2",
"csa/guzzle-bundle": "^2.2",
"cweagans/composer-patches": "^1.6",
"elife/api-client": "^1.0@dev",
"elife/api-sdk": "dev-master",
"elife/api": "dev-develop",
"elife/api-client": "dev-master",
"elife/api-sdk": "dev-staging",
"elife/civi-contacts": "dev-master",
"elife/patterns": "dev-master",
"elife/patterns": "dev-staging",
"fabpot/goutte": "^3.2",
"fig/link-util": "^1.0",
"firebase/php-jwt": "^5.0",
Expand Down Expand Up @@ -57,7 +58,6 @@
"behat/mink-extension": "^2.3",
"behat/mink-selenium2-driver": "^1.3",
"behat/symfony2-extension": "^2.1",
"elife/api": "^2.1",
"elife/api-validator": "^1.0@dev",
"jarnaiz/behat-junit-formatter": "^1.3",
"justinrainbow/json-schema": "^5.2",
Expand Down
Loading