-
Notifications
You must be signed in to change notification settings - Fork 437
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
Angular upgrade: this connects to #83 and this connects to #86 #123
Merged
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
c08f5c6
dependency upgrades, server and platform module updates, linting wip
wwelling d131e1c
fixed pagination component spec, linting wip
wwelling 8ba6959
updated environment config comments
wwelling 8a0eb1a
fixed linting in pagination component spec
wwelling ff934d0
upgraded to ngx-pagination
wwelling d864b30
downgraded zone.js, breaks ci
wwelling 929fc90
updated dspace logo and favicon
wwelling 75cb60e
added new dspace logo to home page news section
wwelling 066bba2
fixed lint errors
wwelling 41cda80
have default config use rehydrate pre-render strategy
wwelling 35e8bbf
turn off debug for default config
wwelling 9507b38
updated file tree in readme
wwelling ec7e7fd
upgraded node types
wwelling 5a7df67
allow weak typed comparison in pagination component
wwelling 4ffb8a6
fixed environment config, upgraded angular again
wwelling 0449e36
fixed linting on config.ts
wwelling b19daa8
upgraded postcss
wwelling c42004e
fixed coverege error
wwelling 40dc207
updated yarn lock
wwelling 8e87d3e
resolved critial dependency warning
wwelling 583f6e9
have prod, test, and dev environment config files override default
wwelling 4ab26b1
add timestamp to listening console log
wwelling 9352440
fixed base url construction
wwelling bd76342
abstracted server start logging
wwelling 1c28180
added CSR fallback and optionally disable SSR
wwelling db0505c
upgraded some dependencies
wwelling 89d8159
upgraded angular again
wwelling d4179bc
upgraded zone.js
wwelling 1ec0c61
upgraded webpack
wwelling File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Copyright 2015-2016, Google, Inc. | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# [START app_yaml] | ||
runtime: nodejs | ||
env: flex | ||
# [END app_yaml] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,30 @@ | ||
module.exports = { | ||
// The REST API server settings. | ||
"rest": { | ||
"ssl": false, | ||
"address": "dspace7.4science.it", | ||
"port": 80, | ||
// Angular2 UI server settings. | ||
ui: { | ||
ssl: false, | ||
host: 'localhost', | ||
port: 3000, | ||
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript | ||
"nameSpace": "/dspace-spring-rest/api" | ||
nameSpace: '/' | ||
}, | ||
// Angular2 UI server settings. | ||
"ui": { | ||
"ssl": false, | ||
"address": "localhost", | ||
"port": 3000, | ||
// The REST API server settings. | ||
rest: { | ||
ssl: false, | ||
host: 'dspace7.4science.it', | ||
port: 80, | ||
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript | ||
"nameSpace": "/" | ||
nameSpace: '/dspace-spring-rest/api' | ||
}, | ||
"cache": { | ||
cache: { | ||
// how long should objects be cached for by default | ||
"msToLive": 15 * 60 * 1000, // 15 minute | ||
"control": "max-age=60" // revalidate browser | ||
msToLive: 15 * 60 * 1000, // 15 minute | ||
control: 'max-age=60' // revalidate browser | ||
}, | ||
"universal": { | ||
// Angular Universal settings | ||
"preboot": true, | ||
"async": true | ||
} | ||
logDirectory: '.', | ||
// NOTE: rehydrate or replay | ||
// rehydrate will transfer prerender state to browser state, actions do not need to replay | ||
// replay will transfer an array of actions to browser, actions replay automatically | ||
prerenderStrategy: 'replay', | ||
// NOTE: will log all redux actions and transfers in console | ||
debug: true | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
module.exports = { | ||
// Angular2 UI server settings. | ||
ui: { | ||
ssl: false, | ||
host: 'localhost', | ||
port: 3000, | ||
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript | ||
nameSpace: '/' | ||
}, | ||
// The REST API server settings. | ||
rest: { | ||
ssl: false, | ||
host: 'dspace7.4science.it', | ||
port: 80, | ||
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript | ||
nameSpace: '/dspace-spring-rest/api' | ||
}, | ||
cache: { | ||
// how long should objects be cached for by default | ||
msToLive: 15 * 60 * 1000, // 15 minute | ||
control: 'max-age=60' // revalidate browser | ||
}, | ||
logDirectory: '.', | ||
// NOTE: rehydrate or replay | ||
// rehydrate will transfer prerender state to browser state, actions do not need to replay | ||
// replay will transfer an array of actions to browser, actions replay automatically | ||
prerenderStrategy: 'rehydrate', | ||
// NOTE: will log all redux actions and transfers in console | ||
debug: true | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
import { ProtractorPage } from './pagenotfound.po'; | ||
|
||
describe('protractor PageNotFound', function() { | ||
describe('protractor PageNotFound', () => { | ||
let page: ProtractorPage; | ||
|
||
beforeEach(() => { | ||
page = new ProtractorPage(); | ||
}); | ||
|
||
it('should contain element ds-pagenotfound when navigating to page that doesnt exist"', () => { | ||
it('should contain element ds-pagenotfound when navigating to page that doesnt exist', () => { | ||
page.navigateToNonExistingPage(); | ||
expect(page.elementTagExists("ds-pagenotfound")).toEqual(true); | ||
expect<any>(page.elementTagExists('ds-pagenotfound')).toEqual(true); | ||
}); | ||
|
||
it('should not contain element ds-pagenotfound when navigating to existing page"', () => { | ||
it('should not contain element ds-pagenotfound when navigating to existing page', () => { | ||
page.navigateToExistingPage(); | ||
expect(page.elementTagExists("ds-pagenotfound")).toEqual(false); | ||
expect<any>(page.elementTagExists('ds-pagenotfound')).toEqual(false); | ||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Angular2?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will update.