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

Theme konnectd #698

Merged
merged 22 commits into from
Oct 19, 2020
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
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
3 changes: 2 additions & 1 deletion .codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ exclude_paths:
- 'docs/**'
- '**/docs/**'
- '**/pkg/proto/**'
- 'konnectd/assets/identifier/**'
- 'konnectd/ui_config/**'
- 'konnectd/scripts/**'
- 'settings/rollup.config.js'
- 'accounts/rollup.config.js'
- 'ocis/docker/eos-ocis/Dockerfile'
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ node_modules/
*/assets

.idea

*/yarn-error.log

# Konnectd
konnectd/assets/identifier
7 changes: 7 additions & 0 deletions changelog/unreleased/themed-kopano
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Change: Bring oC theme

Tags: konnectd

We've styled our konnectd login page to reflect ownCloud theme.

https://github.com/owncloud/ocis/pull/698
5 changes: 5 additions & 0 deletions konnectd/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
PORT=3001
HOST=127.0.0.1
BROWSER=none
INLINE_RUNTIME_CHUNK=false
EXTEND_ESLINT=true
3 changes: 3 additions & 0 deletions konnectd/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build/*
node_modules/*

30 changes: 30 additions & 0 deletions konnectd/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"plugins": ["react-intl-format"],
"extends": ["plugin:react/recommended", "plugin:jest/recommended"],
"settings": {
"react": {
"version": "detect"
}
},
"parser": "babel-eslint",
"rules": {
"react-intl-format/missing-formatted-message": [
"error",
{
"noTrailingWhitespace": false,
"ignoreLinks": false
}
],
"react-intl-format/missing-attribute": [
"error",
{
"noTrailingWhitespace": false,
"noSpreadOperator": true
}
],
"react-intl-format/missing-values": [
"error"
],
"react/display-name": "off"
}
}
12 changes: 11 additions & 1 deletion konnectd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ GENERATE ?= $(PACKAGES)

TAGS ?=

# Assets
LOGO_URL = https://raw.githubusercontent.com/owncloud/assets/main/logo.svg
FAVICON_URL = https://raw.githubusercontent.com/owncloud/assets/main/favicon.ico

ifndef OUTPUT
ifneq ($(DRONE_TAG),)
OUTPUT ?= $(subst v,,$(DRONE_TAG))
Expand Down Expand Up @@ -77,9 +81,15 @@ lint:
for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;

.PHONY: generate
generate:
generate: assets
go generate $(GENERATE)

.PHONY: assets
assets:
mkdir -p assets/identifier/static
curl -o assets/identifier/static/logo.svg ${LOGO_URL}
curl -o assets/identifier/static/favicon.ico ${FAVICON_URL}

.PHONY: changelog
changelog:
go run github.com/restic/calens >| CHANGELOG.md
Expand Down
22 changes: 0 additions & 22 deletions konnectd/assets/identifier/asset-manifest.json

This file was deleted.

1 change: 0 additions & 1 deletion konnectd/assets/identifier/index.html

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions konnectd/assets/identifier/static/css/main.ed0ebb7d.chunk.css

This file was deleted.

This file was deleted.

Binary file removed konnectd/assets/identifier/static/favicon.ico
Binary file not shown.
2 changes: 0 additions & 2 deletions konnectd/assets/identifier/static/js/4.f92d7884.chunk.js

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions konnectd/assets/identifier/static/js/5.b1222fed.chunk.js

This file was deleted.

This file was deleted.

This file was deleted.

Loading