From bbfb4bc02690fbc167e5f3cd63df628345b9c5f3 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Thu, 31 Oct 2019 19:58:09 -0400 Subject: [PATCH 1/8] added redirection to url root --- .../add-new-account/add-new-account.component.ts | 2 +- .../streams-main-display.component.ts | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app/components/floating-column/add-new-account/add-new-account.component.ts b/src/app/components/floating-column/add-new-account/add-new-account.component.ts index fd370cbf..a031f780 100644 --- a/src/app/components/floating-column/add-new-account/add-new-account.component.ts +++ b/src/app/components/floating-column/add-new-account/add-new-account.component.ts @@ -101,7 +101,7 @@ export class AddNewAccountComponent implements OnInit { if (instanceApps.length !== 0) { return Promise.resolve(instanceApps[0].app); } else { - const redirect_uri = this.getLocalHostname() + '/register'; + const redirect_uri = this.getLocalHostname(); return this.authService.createNewApplication(instance, 'Sengi', redirect_uri, 'read write follow', 'https://nicolasconstant.github.io/sengi/') .then((appData: AppData) => { return this.saveNewApp(instance, appData) diff --git a/src/app/pages/streams-main-display/streams-main-display.component.ts b/src/app/pages/streams-main-display/streams-main-display.component.ts index 96c0309a..856c4265 100644 --- a/src/app/pages/streams-main-display/streams-main-display.component.ts +++ b/src/app/pages/streams-main-display/streams-main-display.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit, OnDestroy, QueryList, ViewChildren, ElementRef } from "@angular/core"; +import { ActivatedRoute, Router } from '@angular/router'; import { Observable, Subscription } from "rxjs"; import { Select } from "@ngxs/store"; import scrollIntoView from "smooth-scroll-into-view-if-needed"; @@ -19,10 +20,20 @@ export class StreamsMainDisplayComponent implements OnInit, OnDestroy { private columnSelectedSub: Subscription; constructor( + private readonly router: Router, + private readonly activatedRoute: ActivatedRoute, private readonly navigationService: NavigationService) { } ngOnInit() { + this.activatedRoute.queryParams.subscribe(params => { + const code = params['code']; + if (code) { + this.router.navigate(['/register'], { queryParams: { code: code} }); + return; + } + }); + this.columnSelectedSub = this.navigationService.columnSelectedSubject.subscribe((columnIndex: number) => { this.focusOnColumn(columnIndex); }); From e137317dc19bdb422eb617e72892f966cf263512 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Thu, 31 Oct 2019 23:49:13 -0400 Subject: [PATCH 2/8] added build folder --- .dockerignore | 3 +++ package-lock.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 7a03f839..64408669 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,7 @@ .git .gitignore .travis.yml +appveyor.yml .vscode +node_modules +dist \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index badbe27d..5c62ef89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "sengi", - "version": "0.16.2", + "version": "0.18.1", "lockfileVersion": 1, "requires": true, "dependencies": { From 99b1ea3a2b65a15d73f6589cecedd18a87e5ef2c Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Fri, 1 Nov 2019 00:14:51 -0400 Subject: [PATCH 3/8] added url rewriting rules --- lighttpd.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lighttpd.conf b/lighttpd.conf index 3b0cac23..420fabfa 100644 --- a/lighttpd.conf +++ b/lighttpd.conf @@ -10,3 +10,5 @@ server.modules = ( include "mime-types.conf" server.pid-file = "/run/lighttpd.pid" index-file.names = ( "index.html", "index.htm" ) +url.rewrite-once = ( "^/(.*)" => "/index.html" ) +server.error-handler-404 = "/index.html" \ No newline at end of file From 382a3df3bf4a8cfaeba0054d56158ea2ab187338 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Sat, 2 Nov 2019 00:47:04 -0400 Subject: [PATCH 4/8] added sengi launcher --- Dockerfile | 3 ++- assets/docker_init/index.html | 1 + lighttpd.conf | 4 ++-- .../add-new-account/add-new-account.component.ts | 9 +++++++-- 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 assets/docker_init/index.html diff --git a/Dockerfile b/Dockerfile index ab192c68..57b547ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,8 @@ FROM alpine:latest RUN apk add --update --no-cache lighttpd ADD lighttpd.conf /etc/lighttpd/lighttpd.conf -COPY --from=build /build/dist /app +COPY --from=build /build/dist /app/sengi +COPY --from=build /build/assets/docker_init /app EXPOSE 80 diff --git a/assets/docker_init/index.html b/assets/docker_init/index.html new file mode 100644 index 00000000..38e77596 --- /dev/null +++ b/assets/docker_init/index.html @@ -0,0 +1 @@ +

TEST

\ No newline at end of file diff --git a/lighttpd.conf b/lighttpd.conf index 420fabfa..7b0d821f 100644 --- a/lighttpd.conf +++ b/lighttpd.conf @@ -10,5 +10,5 @@ server.modules = ( include "mime-types.conf" server.pid-file = "/run/lighttpd.pid" index-file.names = ( "index.html", "index.htm" ) -url.rewrite-once = ( "^/(.*)" => "/index.html" ) -server.error-handler-404 = "/index.html" \ No newline at end of file +#url.rewrite-once = ( "^sengi/(.*)" => "/sengi/index.html" ) +server.error-handler-404 = "/sengi/index.html" \ No newline at end of file diff --git a/src/app/components/floating-column/add-new-account/add-new-account.component.ts b/src/app/components/floating-column/add-new-account/add-new-account.component.ts index a031f780..3176d2c8 100644 --- a/src/app/components/floating-column/add-new-account/add-new-account.component.ts +++ b/src/app/components/floating-column/add-new-account/add-new-account.component.ts @@ -6,6 +6,7 @@ import { RegisteredAppsStateModel, AppInfo, AddRegisteredApp } from '../../../st import { AuthService, CurrentAuthProcess } from '../../../services/auth.service'; import { AppData } from '../../../services/models/mastodon.interfaces'; import { NotificationService } from '../../../services/notification.service'; +import { HttpXsrfInterceptor } from '@angular/common/http/src/xsrf'; @Component({ selector: 'app-add-new-account', @@ -132,8 +133,12 @@ export class AddNewAccountComponent implements OnInit { } private getLocalHostname(): string { - let localHostname = location.protocol + '//' + location.hostname + (location.port ? ':' + location.port : ''); - return localHostname; + let href = window.location.href; + if(href.includes('/home')){ + return href.split('/home')[0]; + } else { + return location.protocol + '//' + location.hostname + (location.port ? ':' + location.port : ''); + } } private saveNewApp(instance: string, app: AppData): Promise { From 329bdffd20ce301fbd073b8c2771935c94d1f6eb Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Sat, 2 Nov 2019 01:21:58 -0400 Subject: [PATCH 5/8] create proper launcher page --- assets/docker_init/favicon.png | Bin 0 -> 13116 bytes assets/docker_init/index.html | 30 +++++++++++++++++++++- assets/docker_init/main.css | 45 +++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 assets/docker_init/favicon.png create mode 100644 assets/docker_init/main.css diff --git a/assets/docker_init/favicon.png b/assets/docker_init/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..40ff3851f0261b57afe49107ba81e862edc44b90 GIT binary patch literal 13116 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 \ No newline at end of file + + + + + + + + + + + Sengi Launcher + + + + + + + \ No newline at end of file diff --git a/assets/docker_init/main.css b/assets/docker_init/main.css new file mode 100644 index 00000000..55cba4c0 --- /dev/null +++ b/assets/docker_init/main.css @@ -0,0 +1,45 @@ +*, *::after, *::before { + margin: 0; + padding: 0; + box-sizing: inherit; +} + +html { + font-size: 62.5%; + background-color: #141824; + font-family: Verdana, Geneva, sans-serif; +} + +body { + box-sizing: border-box; + overflow: hidden; +} + +.launcher-wrapper{ + display: flex; + align-items: center; + justify-content: center; +} + +.launcher { + height: 15rem; + width: 30rem; + margin: 35vh auto; +} + +.button { + background-color: #090b10; + display: block; + width: 30rem; + padding: 1.5rem 2rem 1.75rem 2rem; + color: white; + border-radius: 3px; + font-size: 1.8rem; + font-weight: lighter; + text-decoration: none; + transition: all .2s; +} + +.button:hover { + background-color: #1e2433; +} \ No newline at end of file From 6d7ddec1bd5883e03af5ddb19584a135a31e826e Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Sat, 2 Nov 2019 01:24:47 -0400 Subject: [PATCH 6/8] road to 0.18.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f6b6d3b..0ecaa1e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sengi", - "version": "0.18.1", + "version": "0.18.2", "license": "AGPL-3.0-or-later", "main": "main-electron.js", "description": "A multi-account desktop client for Mastodon and Pleroma", From 903fdce2321ae7d76043249b57835ec2fc67874f Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Sat, 2 Nov 2019 01:30:41 -0400 Subject: [PATCH 7/8] fix tests --- .../components/create-status/create-status.component.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/components/create-status/create-status.component.spec.ts b/src/app/components/create-status/create-status.component.spec.ts index e0e682df..956d4efe 100644 --- a/src/app/components/create-status/create-status.component.spec.ts +++ b/src/app/components/create-status/create-status.component.spec.ts @@ -14,6 +14,7 @@ import { StreamsState } from '../../states/streams.state'; import { NavigationService } from '../../services/navigation.service'; import { NotificationService } from '../../services/notification.service'; import { MastodonService } from '../../services/mastodon.service'; +import { AuthService } from '../../services/auth.service'; describe('CreateStatusComponent', () => { @@ -35,7 +36,7 @@ describe('CreateStatusComponent', () => { StreamsState ]), ], - providers: [NavigationService, NotificationService, MastodonService], + providers: [NavigationService, NotificationService, MastodonService, AuthService], schemas: [ CUSTOM_ELEMENTS_SCHEMA ] }).compileComponents(); })); From c5bf07a1a677e9dc94d8b1039e527415cf5c78ef Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Sat, 2 Nov 2019 01:32:17 -0400 Subject: [PATCH 8/8] clean up --- .../floating-column/add-new-account/add-new-account.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/components/floating-column/add-new-account/add-new-account.component.ts b/src/app/components/floating-column/add-new-account/add-new-account.component.ts index 3176d2c8..e9865051 100644 --- a/src/app/components/floating-column/add-new-account/add-new-account.component.ts +++ b/src/app/components/floating-column/add-new-account/add-new-account.component.ts @@ -6,7 +6,6 @@ import { RegisteredAppsStateModel, AppInfo, AddRegisteredApp } from '../../../st import { AuthService, CurrentAuthProcess } from '../../../services/auth.service'; import { AppData } from '../../../services/models/mastodon.interfaces'; import { NotificationService } from '../../../services/notification.service'; -import { HttpXsrfInterceptor } from '@angular/common/http/src/xsrf'; @Component({ selector: 'app-add-new-account',