Merge pull request #698 from owncloud/branded-kopano

owncloud · Oct 19, 2020 · a2823a0 · a2823a0
2 parents eb31510 + b8f64ce
commit a2823a0
Show file tree

Hide file tree

Showing 141 changed files with 22,515 additions and 766 deletions.
diff --git a/.codacy.yml b/.codacy.yml
@@ -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'

diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,8 @@ node_modules/
 */assets
 
 .idea
+
+*/yarn-error.log
+
+# Konnectd
+konnectd/assets/identifier
diff --git a/changelog/unreleased/themed-kopano b/changelog/unreleased/themed-kopano
@@ -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
diff --git a/konnectd/.env b/konnectd/.env
@@ -0,0 +1,5 @@
+PORT=3001
+HOST=127.0.0.1
+BROWSER=none
+INLINE_RUNTIME_CHUNK=false
+EXTEND_ESLINT=true
diff --git a/konnectd/.eslintignore b/konnectd/.eslintignore
@@ -0,0 +1,3 @@
+build/*
+node_modules/*
+
diff --git a/konnectd/.eslintrc.json b/konnectd/.eslintrc.json
@@ -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"
+	}
+}
diff --git a/konnectd/Makefile b/konnectd/Makefile
@@ -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))
@@ -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

diff --git a/konnectd/assets/identifier/asset-manifest.json b/konnectd/assets/identifier/asset-manifest.json
diff --git a/konnectd/assets/identifier/index.html b/konnectd/assets/identifier/index.html
diff --git a/konnectd/assets/identifier/precache-manifest.ea8b619599c55ba5f128f51d796152cd.js b/konnectd/assets/identifier/precache-manifest.ea8b619599c55ba5f128f51d796152cd.js
diff --git a/konnectd/assets/identifier/static/css/main.ed0ebb7d.chunk.css b/konnectd/assets/identifier/static/css/main.ed0ebb7d.chunk.css
diff --git a/konnectd/assets/identifier/static/css/main.ed0ebb7d.chunk.css.map b/konnectd/assets/identifier/static/css/main.ed0ebb7d.chunk.css.map
diff --git a/konnectd/assets/identifier/static/favicon.ico b/konnectd/assets/identifier/static/favicon.ico
diff --git a/konnectd/assets/identifier/static/js/4.f92d7884.chunk.js b/konnectd/assets/identifier/static/js/4.f92d7884.chunk.js
diff --git a/konnectd/assets/identifier/static/js/4.f92d7884.chunk.js.map b/konnectd/assets/identifier/static/js/4.f92d7884.chunk.js.map
diff --git a/konnectd/assets/identifier/static/js/5.b1222fed.chunk.js b/konnectd/assets/identifier/static/js/5.b1222fed.chunk.js
diff --git a/konnectd/assets/identifier/static/js/5.b1222fed.chunk.js.map b/konnectd/assets/identifier/static/js/5.b1222fed.chunk.js.map
diff --git a/konnectd/assets/identifier/static/js/identifier-app.b36b0d07.chunk.js b/konnectd/assets/identifier/static/js/identifier-app.b36b0d07.chunk.js