Merge pull request #3964 from jsaalfeld/fix_urlPrefix

fixing urlPrefix in prod environment
This commit is contained in:
Sean 2018-11-02 10:14:21 +01:00 committed by GitHub
commit 8aca83a6bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 17 deletions

View File

@ -46,21 +46,63 @@ matrix:
packages: packages:
- google-chrome-stable - google-chrome-stable
cache: cache:
yarn: true
directories: directories:
- $HOME/.yarn-cache
- node_modules - node_modules
before_install: before_install:
- sh -e /etc/init.d/xvfb start - sh -e /etc/init.d/xvfb start
- export CHROME_BIN=/usr/bin/google-chrome - export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- curl -o- -L https://yarnpkg.com/install.sh | bash - npm install -g @angular/cli
- export PATH="$HOME/.yarn/bin:$PATH"
- yarn global add @angular/cli
- ng --version - ng --version
- cd client - cd client
install: install:
- yarn install - npm install
script: script:
- yarn run lint - npm run lint
- yarn run test --watch=false - ng test --watch=false
- language: node_js
node_js:
- "10.5"
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
cache:
directories:
- node_modules
before_install:
- sh -e /etc/init.d/xvfb start
- export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- npm install -g @angular/cli
- ng --version
- cd client
install:
- npm install
script:
- ng build
- language: node_js
node_js:
- "10.5"
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
cache:
directories:
- node_modules
before_install:
- sh -e /etc/init.d/xvfb start
- export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- npm install -g @angular/cli
- ng --version
- cd client
install:
- npm install
script:
- ng build --prod

View File

@ -18,6 +18,7 @@ Core:
mode [#3799, #3817]. mode [#3799, #3817].
- Changed format for elements send via autoupdate [#3926]. - Changed format for elements send via autoupdate [#3926].
- Add a change-id system to get only new elements [#3938]. - Add a change-id system to get only new elements [#3938].
- Switch from Yarn back to npm.
Motions: Motions:
- Option to customly sort motions [#3894]. - Option to customly sort motions [#3894].

View File

@ -16,14 +16,13 @@ a. Check requirements
''''''''''''''''''''' '''''''''''''''''''''
Make sure that you have installed `Python (>= 3.6) <https://www.python.org/>`_, Make sure that you have installed `Python (>= 3.6) <https://www.python.org/>`_,
`Node.js (>=4.x) <https://nodejs.org/>`_, `Yarn <https://yarnpkg.com/>`_ and `Node.js (>=10.x) <https://nodejs.org/>`_ and
`Git <http://git-scm.com/>`_ on your system. You also need build-essential `Git <http://git-scm.com/>`_ on your system. You also need build-essential
packages and header files and a static library for Python. packages and header files and a static library for Python.
For Ubuntu 16.04 e. g. follow `Yarn installation instructions For Debian based systems (Ubuntu, etc) run::
<https://yarnpkg.com/en/docs/install>`_ and run::
$ sudo apt-get install git nodejs nodejs-legacy npm build-essential python3-dev $ sudo apt-get install git nodejs npm build-essential python3-dev
b. Get OpenSlides source code b. Get OpenSlides source code
@ -81,13 +80,13 @@ Go in the client's directory in a second command-line interface::
Install all dependencies and start the development server:: Install all dependencies and start the development server::
$ npm install $ npm install
$ yarn start $ npm start
Now the client is available under ``localhost:4200``. Now the client is available under ``localhost:4200``.
If you do not need to work with the client, you can build the client and let it be delivered by the server directly:: If you do not need to work with the client, you can build the client and let it be delivered by the server directly::
$ yarn build $ npm build
The client's address is now ``localhost:8000``. The client's address is now ``localhost:8000``.
@ -131,15 +130,15 @@ b. Client tests and commands
Change to the client's directory to run every client related command. Run client tests:: Change to the client's directory to run every client related command. Run client tests::
$ yarn test $ npm test
Fix the code format and lint it with:: Fix the code format and lint it with::
$ yarn pretty-quick && yarn lint npm run lint
To extract translations run:: To extract translations run::
$ yarn extract $ npm run extract
OpenSlides in big mode OpenSlides in big mode
====================== ======================