summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2021-10-11 09:49:38 +0200
committerVivien Kraus <vivien@planete-kraus.eu>2021-10-12 22:41:58 +0200
commit81081d1fbf71edb72465b9be12cf3b29eaa77767 (patch)
tree49dbef3d54ae1cae13e1c42e7cd7f3caebfcb9cd
parentb22d214a42ce1a9daf0e3f19784b55bdef5b5fa3 (diff)
client: display the error page widget
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/disfluid.pot2
-rw-r--r--po/fr.po2
-rw-r--r--src/scm/webid-oidc/client/gui/Makefile.am6
-rw-r--r--src/scm/webid-oidc/client/gui/application.scm1
-rw-r--r--src/scm/webid-oidc/client/gui/error-page.scm80
6 files changed, 88 insertions, 4 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 76881e2..da154b4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -47,6 +47,7 @@ src/scm/webid-oidc/client/gui/authorization-prompt.scm
src/scm/webid-oidc/client/gui/authorizations-widget.scm
src/scm/webid-oidc/client/gui/client-widget.scm
src/scm/webid-oidc/client/gui/clock.scm
+src/scm/webid-oidc/client/gui/error-page.scm
src/scm/webid-oidc/client/gui/loading-page.scm
src/scm/webid-oidc/client/gui/new-page.scm
src/scm/webid-oidc/client/gui/settings.scm
diff --git a/po/disfluid.pot b/po/disfluid.pot
index d152564..a7d319e 100644
--- a/po/disfluid.pot
+++ b/po/disfluid.pot
@@ -690,7 +690,7 @@ msgstr ""
msgid "Please add an account."
msgstr ""
-#: src/scm/webid-oidc/client/gui/application.scm:98
+#: src/scm/webid-oidc/client/gui/application.scm:99
msgid "Coming soon!"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 2745c38..a4591e8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -755,7 +755,7 @@ msgstr "Bouchon : veuillez entrer une URI ou un nom d’hôte…\n"
msgid "Please add an account."
msgstr "Veuillez ajouter un compte."
-#: src/scm/webid-oidc/client/gui/application.scm:98
+#: src/scm/webid-oidc/client/gui/application.scm:99
msgid "Coming soon!"
msgstr "C’est pour bientôt !"
diff --git a/src/scm/webid-oidc/client/gui/Makefile.am b/src/scm/webid-oidc/client/gui/Makefile.am
index 26e7619..cb113cd 100644
--- a/src/scm/webid-oidc/client/gui/Makefile.am
+++ b/src/scm/webid-oidc/client/gui/Makefile.am
@@ -26,7 +26,8 @@ dist_guiclientwebidoidcmod_DATA += \
%reldir%/clock.scm \
%reldir%/authorizations-widget.scm \
%reldir%/new-page.scm \
- %reldir%/loading-page.scm
+ %reldir%/loading-page.scm \
+ %reldir%/error-page.scm
guiclientwebidoidcgo_DATA += \
%reldir%/settings.go \
@@ -40,4 +41,5 @@ guiclientwebidoidcgo_DATA += \
%reldir%/authorizations-widget.go \
%reldir%/clock.go \
%reldir%/new-page.go \
- %reldir%/loading-page.go
+ %reldir%/loading-page.go \
+ %reldir%/error-page.go
diff --git a/src/scm/webid-oidc/client/gui/application.scm b/src/scm/webid-oidc/client/gui/application.scm
index 476ec01..df7f080 100644
--- a/src/scm/webid-oidc/client/gui/application.scm
+++ b/src/scm/webid-oidc/client/gui/application.scm
@@ -41,6 +41,7 @@
#:use-module ((webid-oidc client gui authorizations-widget) #:prefix authorizations:)
#:use-module ((webid-oidc client gui new-page) #:prefix page:)
#:use-module ((webid-oidc client gui loading-page) #:prefix page:)
+ #:use-module ((webid-oidc client gui error-page) #:prefix page:)
#:use-module (webid-oidc client gui application-hooks)
#:use-module (webid-oidc client application)
#:use-module (web uri)
diff --git a/src/scm/webid-oidc/client/gui/error-page.scm b/src/scm/webid-oidc/client/gui/error-page.scm
new file mode 100644
index 0000000..6d20263
--- /dev/null
+++ b/src/scm/webid-oidc/client/gui/error-page.scm
@@ -0,0 +1,80 @@
+;; disfluid, implementation of the Solid specification
+;; Copyright (C) 2021 Vivien Kraus
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU Affero General Public License as
+;; published by the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU Affero General Public License for more details.
+
+;; You should have received a copy of the GNU Affero General Public License
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+(define-module (webid-oidc client gui error-page)
+ #:use-module (gi)
+ #:use-module (gi types)
+ #:use-module (gi util)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 exceptions)
+ #:use-module (ice-9 i18n)
+ #:use-module (ice-9 receive)
+ #:use-module (ice-9 optargs)
+ #:use-module (ice-9 pretty-print)
+ #:use-module (ice-9 atomic)
+ #:use-module (srfi srfi-9)
+ #:use-module (srfi srfi-19)
+ #:use-module (srfi srfi-26)
+ #:use-module (webid-oidc errors)
+ #:use-module ((webid-oidc stubs) #:prefix stubs:)
+ #:use-module ((webid-oidc config) #:prefix config:)
+ #:use-module (webid-oidc web-i18n)
+ #:use-module (webid-oidc client client)
+ #:use-module (webid-oidc client accounts)
+ #:use-module ((webid-oidc client gui settings) #:prefix settings:)
+ #:use-module ((webid-oidc client gui clock) #:prefix clock:)
+ #:use-module (webid-oidc client gui application-hooks)
+ #:use-module (webid-oidc client application)
+ #:use-module (webid-oidc jwk)
+ #:use-module (webid-oidc oidc-id-token)
+ #:use-module (web uri)
+ #:use-module (web response)
+ #:use-module (rnrs bytevectors)
+ #:use-module (oop goops)
+ #:declarative? #t
+ #:duplicates (merge-generics)
+ #:export
+ (
+ ->widget
+ ))
+
+(push-duplicate-handler! 'merge-generics)
+
+;; This avoids a crash when compiling the module
+(use-typelibs ("GdkPixbuf" "2.0")
+ ("Gtk" "3.0"))
+
+(define-method (->widget (page <error-page>))
+ (let ((builder
+ (builder:new-from-file
+ (string-append config:uidir "/error-page.glade"))))
+ (let ((main-widget
+ (builder:get-object builder "error_page"))
+ (code-label
+ (builder:get-object builder "code"))
+ (reason-phrase-label
+ (builder:get-object builder "reason_phrase"))
+ (uri-entry
+ (builder:get-object builder "uri_entry")))
+ (label:set-text code-label (number->string (code page)))
+ (label:set-text reason-phrase-label (reason-phrase page))
+ (entry:set-text uri-entry (uri->string (uri page)))
+ (connect uri-entry activate
+ (lambda _
+ (settings:application-state
+ (set-page-uri (settings:application-state)
+ (entry:get-text uri-entry)))))
+ (values builder main-widget))))