Skip to content

Commit

Permalink
Rename all Phoenix occurences to Web
Browse files Browse the repository at this point in the history
  • Loading branch information
LukasHirt committed Dec 11, 2020
1 parent 25058b6 commit 4560f24
Show file tree
Hide file tree
Showing 233 changed files with 631 additions and 623 deletions.
72 changes: 36 additions & 36 deletions .drone.star
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
config = {
'app': 'phoenix',
'app': 'web',
'rocketchat': {
'channel': 'builds',
'from_secret': 'private_rocketchat'
Expand Down Expand Up @@ -623,7 +623,7 @@ def acceptance():
},
'steps':
installNPM() +
buildPhoenix() +
buildWeb() +
cloneOCIS(params['ocisBranch']) +
(
(
Expand All @@ -639,9 +639,9 @@ def acceptance():
setupGraphapiOIdC() +
buildGlauth() +
buildKonnectd() +
buildOcisPhoenix() +
buildOcisWeb() +
konnectdService() +
ocisPhoenixService() +
ocisWebService() +
glauthService()+
fixPermissions()
) if not params['runningOnOCIS'] else (
Expand Down Expand Up @@ -746,7 +746,7 @@ def notify():
def databaseServiceForFederation(db, suffix):
dbName = getDbName(db)

# only support mariadb, for phoenix, it's not important to support others
# only support mariadb, for web, it's not important to support others
if dbName not in ['mariadb', 'mysql']:
print('Not implemented federated database for', dbName)
return []
Expand Down Expand Up @@ -1010,16 +1010,16 @@ def lintTest():
]
}]

def buildPhoenix():
def buildWeb():
return [{
'name': 'build-phoenix',
'name': 'build-web',
'image': 'webhippie/nodejs:latest',
'pull': 'always',
'commands': [
'yarn dist',
'cp tests/drone/config.json dist/config.json',
'mkdir -p /srv/config',
'cp -r /var/www/owncloud/phoenix/tests/drone /srv/config',
'cp -r /var/www/owncloud/web/tests/drone /srv/config',
'ls -la /srv/config/drone'
],
'volumes': [{
Expand All @@ -1041,7 +1041,7 @@ def buildDockerImage():
'from_secret': 'docker_password',
},
'auto_tag': True,
'repo': 'owncloud/phoenix',
'repo': 'owncloud/web',
},
'when': {
'ref': {
Expand All @@ -1059,7 +1059,7 @@ def buildRelease(ctx):
'image': 'webhippie/nodejs:latest',
'pull': 'always',
'commands': [
'cd /var/www/owncloud/phoenix',
'cd /var/www/owncloud/web',
'make -f Makefile.release'
],
},
Expand Down Expand Up @@ -1218,14 +1218,14 @@ def setupGraphapiOIdC():
'cd /var/www/owncloud/server/',
'php occ a:e graphapi',
'php occ a:e openidconnect',
'php occ config:system:set trusted_domains 2 --value=phoenix',
'php occ config:system:set trusted_domains 2 --value=web',
'php occ config:system:set openid-connect provider-url --value="https://konnectd:9130"',
'php occ config:system:set openid-connect loginButtonName --value=OpenId-Connect',
'php occ config:system:set openid-connect client-id --value=phoenix',
'php occ config:system:set openid-connect client-id --value=web',
'php occ config:system:set openid-connect insecure --value=true --type=bool',
'php occ config:system:set cors.allowed-domains 0 --value="http://phoenix:9100"',
'php occ config:system:set cors.allowed-domains 0 --value="http://web:9100"',
'php occ config:system:set memcache.local --value="\\\\OC\\\\Memcache\\\\APCu"',
'php occ config:system:set phoenix.baseUrl --value="http://phoenix:9100"',
'php occ config:system:set web.baseUrl --value="http://web:9100"',
'php occ config:list'
]
}]
Expand Down Expand Up @@ -1401,7 +1401,7 @@ def ocisService():
'STORAGE_USERS_DATA_SERVER_URL': 'http://ocis:9158/data',
'STORAGE_FRONTEND_PUBLIC_URL': 'https://ocis:9200',
'PHOENIX_WEB_CONFIG': '/srv/config/drone/ocis-config.json',
'PHOENIX_ASSET_PATH': '/var/www/owncloud/phoenix/dist',
'PHOENIX_ASSET_PATH': '/var/www/owncloud/web/dist',
'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/srv/config/drone/identifier-registration.yml',
'KONNECTD_ISS': 'https://ocis:9200',
'KONNECTD_TLS': 'true',
Expand All @@ -1423,16 +1423,16 @@ def ocisService():
}],
}]

def buildOcisPhoenix():
def buildOcisWeb():
return[{
'name': 'build-ocis-phoenix',
'name': 'build-ocis-web',
'image': 'webhippie/golang:1.13',
'pull': 'always',
'commands': [
'cd $GOPATH/src/github.com/owncloud/ocis',
'cd ocis-phoenix',
'cd ocis-web',
'make build',
'cp bin/ocis-phoenix /var/www/owncloud'
'cp bin/ocis-web /var/www/owncloud'
],
'volumes': [{
'name': 'gopath',
Expand All @@ -1443,21 +1443,21 @@ def buildOcisPhoenix():
}],
}]

# Ocis-phoenix service just for the oc10 tests
def ocisPhoenixService():
# Ocis-web service just for the oc10 tests
def ocisWebService():
return[{
'name': 'phoenix',
'name': 'web',
'image': 'webhippie/golang:1.13',
'pull': 'always',
'detach': True,
'environment' : {
'PHOENIX_WEB_CONFIG': '/srv/config/drone/config.json',
'PHOENIX_ASSET_PATH': '/var/www/owncloud/phoenix/dist',
'PHOENIX_OIDC_CLIENT_ID': 'phoenix'
'PHOENIX_ASSET_PATH': '/var/www/owncloud/web/dist',
'PHOENIX_OIDC_CLIENT_ID': 'web'
},
'commands': [
'cd /var/www/owncloud',
'./ocis-phoenix --log-level debug server',
'./ocis-web --log-level debug server',
],
'volumes': [{
'name': 'gopath',
Expand All @@ -1477,12 +1477,12 @@ def setupServerAndApp(logLevel):
'cd /var/www/owncloud/server/',
'php occ a:e testing',
'php occ config:system:set trusted_domains 1 --value=owncloud',
'php occ config:system:set cors.allowed-domains 0 --value=http://phoenix',
'php occ config:system:set cors.allowed-domains 0 --value=http://web',
'php occ log:manage --level %s' % logLevel,
'php occ config:list',
'php occ config:system:set skeletondirectory --value=/var/www/owncloud/server/apps/testing/data/webUISkeleton',
'php occ config:system:set dav.enable.tech_preview --type=boolean --value=true',
'php occ config:system:set phoenix.baseUrl --value="http://phoenix"',
'php occ config:system:set web.baseUrl --value="http://web"',
'php occ config:system:set sharing.federation.allowHttpFallback --value=true --type=bool'
]
}]
Expand Down Expand Up @@ -1559,7 +1559,7 @@ def copyFilesForUpload():
}],
'commands': [
'ls -la /filesForUpload',
'cp -a /var/www/owncloud/phoenix/tests/acceptance/filesForUpload/. /filesForUpload',
'cp -a /var/www/owncloud/web/tests/acceptance/filesForUpload/. /filesForUpload',
'ls -la /filesForUpload'
]
}]
Expand Down Expand Up @@ -1589,7 +1589,7 @@ def runWebuiAcceptanceTests(suite, alternateSuiteName, filterTags, extraEnvironm
'from_secret': 'sauce_access_key'
}

environment['SERVER_HOST'] = 'http://phoenix:9100'
environment['SERVER_HOST'] = 'http://web:9100'
environment['BACKEND_HOST'] = 'http://owncloud'

for env in extraEnvironment:
Expand All @@ -1601,7 +1601,7 @@ def runWebuiAcceptanceTests(suite, alternateSuiteName, filterTags, extraEnvironm
'pull': 'always',
'environment': environment,
'commands': [
'cd /var/www/owncloud/phoenix',
'cd /var/www/owncloud/web',
'yarn run acceptance-tests-drone',
],
'volumes': [{
Expand Down Expand Up @@ -1630,11 +1630,11 @@ def uploadScreenshots():
'pull': 'if-not-exists',
'settings': {
'acl': 'public-read',
'bucket': 'phoenix',
'bucket': 'web',
'endpoint': 'https://minio.owncloud.com/',
'path_style': True,
'source': '/var/www/owncloud/phoenix/tests/reports/screenshots/**/*',
'strip_prefix': '/var/www/owncloud/phoenix/tests/reports/screenshots',
'source': '/var/www/owncloud/web/tests/reports/screenshots/**/*',
'strip_prefix': '/var/www/owncloud/web/tests/reports/screenshots',
'target': '/screenshots/${DRONE_BUILD_NUMBER}',
},
'environment': {
Expand All @@ -1661,9 +1661,9 @@ def buildGithubComment(suite, alternateSuiteName):
'image': 'owncloud/ubuntu:16.04',
'pull': 'always',
'commands': [
'cd /var/www/owncloud/phoenix/tests/reports/screenshots/',
'cd /var/www/owncloud/web/tests/reports/screenshots/',
'echo "<details><summary>:boom: Acceptance tests <strong>%s</strong> failed. Please find the screenshots inside ...</summary>\\n\\n${DRONE_BUILD_LINK}/${DRONE_JOB_NUMBER}\\n\\n<p>\\n\\n" >> comments.file' % alternateSuiteName,
'for f in *.png; do echo \'!\'"[$f](https://minio.owncloud.com/phoenix/screenshots/${DRONE_BUILD_NUMBER}/$f)" >> comments.file; done',
'for f in *.png; do echo \'!\'"[$f](https://minio.owncloud.com/web/screenshots/${DRONE_BUILD_NUMBER}/$f)" >> comments.file; done',
'echo "\n</p></details>" >> comments.file',
'more comments.file',
],
Expand All @@ -1686,7 +1686,7 @@ def githubComment():
'image': 'jmccann/drone-github-comment:1',
'pull': 'if-not-exists',
'settings': {
'message_file': '/var/www/owncloud/phoenix/tests/reports/screenshots/comments.file',
'message_file': '/var/www/owncloud/web/tests/reports/screenshots/comments.file',
},
'environment': {
'PLUGIN_API_KEY': {
Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ If you have questions about how to install or use ownCloud, please direct these
- Go to one of the repositories, click "issues" and type any word in the top search/command bar.
- You can also filter by appending e. g. "state:open" to the search string.
- More info on [search syntax within github](https://help.github.com/articles/searching-issues)
* This repository ([phoenix](https://github.com/owncloud/phoenix/issues)) is *only* for issues within the ownCloud Phoenix code.
* This repository ([web](https://github.com/owncloud/web/issues)) is *only* for issues within the oWeb Phoenix code.
* __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/owncloud) or [email protected] following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
* The issues in other components should be reported in their respective repositories:
- [Server core](https://github.com/owncloud/core/issues)
Expand All @@ -25,9 +25,9 @@ If you have questions about how to install or use ownCloud, please direct these

Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.

[template]: https://raw.github.com/owncloud/phoenix/master/.github/issue_template.md
[template]: https://raw.github.com/owncloud/web/master/.github/issue_template.md
[forum]: https://central.owncloud.org/
[rocketchat]: https://talk.owncloud.com/channel/phoenix
[rocketchat]: https://talk.owncloud.com/channel/web

## Contributing to Source Code

Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
Thanks for submitting a change to ownCloud!
This is the bug tracker for Phoenix. Find other components at https://github.com/owncloud/core/blob/master/.github/CONTRIBUTING.md#guidelines
This is the bug tracker for Web. Find other components at https://github.com/owncloud/core/blob/master/.github/CONTRIBUTING.md#guidelines
For fixing potential security issues please see https://owncloud.org/security/
Expand Down
2 changes: 1 addition & 1 deletion .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Comment to be posted to on PRs that don't update documentation
updateDocsComment: >
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/phoenix/blob/master/changelog/README.md) item based on your changes.
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/web/blob/master/changelog/README.md) item based on your changes.
updateDocsWhiteList:
- Tests-only
Expand Down
2 changes: 1 addition & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
Thanks for reporting issues back to ownCloud! This is the issue tracker of ownCloud, if you have any support question please check out https://owncloud.org/support
This is the bug tracker for the Phoenix. Find other components at https://github.com/owncloud/core/blob/master/.github/CONTRIBUTING.md#guidelines
This is the bug tracker for the Web. Find other components at https://github.com/owncloud/core/blob/master/.github/CONTRIBUTING.md#guidelines
For reporting potential security issues please see https://owncloud.org/security/
Expand Down
4 changes: 2 additions & 2 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repository:
name: phoenix
name: web
description: :dragon_face: Next generation frontend for ownCloud X and Infinite Scale
homepage: https://phoenix.owncloud.com/
homepage: https://owncloud.github.io/clients/web/
has_wiki: false
labels:
- name: 1 - To develop
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ all_apps=$(addprefix app-,$(apps))
core_bundle=dist/core/core.bundle.js
DIST := dist
HUGO := hugo
NAME := phoenix
NAME := web

all: build

Expand Down
16 changes: 8 additions & 8 deletions Makefile.release
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ifndef YARN
$(error yarn is not available on your system, please install npm)
endif

app_name=phoenix
app_name=web
cur_dir=$(CURDIR)
dist_dir=$(CURDIR)/dist

Expand All @@ -29,19 +29,19 @@ build-release: build package


.PHONY: build
build: build-phoenix copy-configs
build: build-web copy-configs

.PHONY: build-phoenix
build-phoenix:
.PHONY: build-web
build-web:
rm -rf $(dist_dir)
$(YARN) install
$(YARN) dist

.PHONY: copy-configs
copy-configs: copy-phoenix-config copy-htaccess
copy-configs: copy-web-config copy-htaccess

.PHONY: copy-phoenix-config
copy-phoenix-config:
.PHONY: copy-web-config
copy-web-config:
cp config.json.dist $(dist_dir)/config.json

.Phony: copy-htaccess
Expand Down Expand Up @@ -81,4 +81,4 @@ ocx-app-config:

.PHONY: ocx-app-bundle
ocx-app-bundle:
tar -czf $(CURDIR)/release/$(app_name)-app.tar.gz --transform='s,dist,phoenix,' dist
tar -czf $(CURDIR)/release/$(app_name)-app.tar.gz --transform='s,dist,web,' dist
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# ownCloud-Phoenix
# ownCloud-Web

Pushing a new design and frontend concept to ownCloud

![image](https://user-images.githubusercontent.com/25989331/63966638-fd4e0080-ca9b-11e9-931a-8dd9bf3ba82f.png)

[See this online Demo](https://phoenix.owncloud.com) (user: demo, password: demo)
[See this online Demo](https://web.owncloud.com) (user: demo, password: demo)

## Documentation

Please refer to the [documentation](https://owncloud.github.io/clients/web/getting-started/) for setting up, building and running Phoenix.
Please refer to the [documentation](https://owncloud.github.io/clients/web/getting-started/) for setting up, building and running Web.

2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Next generation user interface for ownCloud based on vue.js.
This is an early release with known limitations and missing features.

Please, report any findings in https://github.com/owncloud/phoenix/issues
Please, report any findings in https://github.com/owncloud/web/issues
</description>
<licence>AGPLv3</licence>
<author>ownCloud</author>
Expand Down
2 changes: 1 addition & 1 deletion apps/draw-io/l10n/.tx/config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com

[owncloud-phoenix.draw-io]
[owncloud-web.draw-io]
file_filter = locale/<lang>/LC_MESSAGES/app.po
minimum_perc = 0
source_file = template.pot
Expand Down
2 changes: 1 addition & 1 deletion apps/files/l10n/.tx/config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com

[owncloud-phoenix.files]
[owncloud-web.files]
file_filter = locale/<lang>/LC_MESSAGES/app.po
minimum_perc = 0
source_file = template.pot
Expand Down
2 changes: 1 addition & 1 deletion apps/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"author": "Felix Heidecke",
"license": "AGPL-3.0",
"homepage": "https://github.com/owncloud/phoenix",
"homepage": "https://github.com/owncloud/web",
"devDependencies": {
"@babel/cli": "^7.6.0",
"@babel/core": "^7.6.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/markdown-editor/l10n/.tx/config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com

[owncloud-phoenix.markdown-editor]
[owncloud-web.markdown-editor]
file_filter = locale/<lang>/LC_MESSAGES/app.po
minimum_perc = 0
source_file = template.pot
Expand Down
Loading

0 comments on commit 4560f24

Please sign in to comment.