summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2021-10-10 20:09:45 +0200
committerVivien Kraus <vivien@planete-kraus.eu>2021-10-12 22:38:07 +0200
commit80270b68953b7827236d5fafc94b34a6b579d9a2 (patch)
tree35b7aa3c3d1e8fe6823032853146de0cdc9438bf
parentb65cf04564c351995bbce76a16987eb8cf406546 (diff)
gui: Display the loading page
-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/loading-page.scm74
6 files changed, 82 insertions, 4 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3da1412..76881e2 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/loading-page.scm
src/scm/webid-oidc/client/gui/new-page.scm
src/scm/webid-oidc/client/gui/settings.scm
src/scm/webid-oidc/dpop-proof.scm
diff --git a/po/disfluid.pot b/po/disfluid.pot
index ce6ac9a..0c65bc1 100644
--- a/po/disfluid.pot
+++ b/po/disfluid.pot
@@ -689,7 +689,7 @@ msgstr ""
msgid "Please add an account."
msgstr ""
-#: src/scm/webid-oidc/client/gui/application.scm:97
+#: src/scm/webid-oidc/client/gui/application.scm:98
msgid "Coming soon!"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index ee02a43..af9792b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -754,7 +754,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:97
+#: src/scm/webid-oidc/client/gui/application.scm:98
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 6969777..26e7619 100644
--- a/src/scm/webid-oidc/client/gui/Makefile.am
+++ b/src/scm/webid-oidc/client/gui/Makefile.am
@@ -25,7 +25,8 @@ dist_guiclientwebidoidcmod_DATA += \
%reldir%/authorization-prompt.scm \
%reldir%/clock.scm \
%reldir%/authorizations-widget.scm \
- %reldir%/new-page.scm
+ %reldir%/new-page.scm \
+ %reldir%/loading-page.scm
guiclientwebidoidcgo_DATA += \
%reldir%/settings.go \
@@ -38,4 +39,5 @@ guiclientwebidoidcgo_DATA += \
%reldir%/authorization-prompt.go \
%reldir%/authorizations-widget.go \
%reldir%/clock.go \
- %reldir%/new-page.go
+ %reldir%/new-page.go \
+ %reldir%/loading-page.go
diff --git a/src/scm/webid-oidc/client/gui/application.scm b/src/scm/webid-oidc/client/gui/application.scm
index 6711d41..476ec01 100644
--- a/src/scm/webid-oidc/client/gui/application.scm
+++ b/src/scm/webid-oidc/client/gui/application.scm
@@ -40,6 +40,7 @@
#:use-module ((webid-oidc client gui accounts-widget) #:prefix accounts:)
#: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 application-hooks)
#:use-module (webid-oidc client application)
#:use-module (web uri)
diff --git a/src/scm/webid-oidc/client/gui/loading-page.scm b/src/scm/webid-oidc/client/gui/loading-page.scm
new file mode 100644
index 0000000..450eab1
--- /dev/null
+++ b/src/scm/webid-oidc/client/gui/loading-page.scm
@@ -0,0 +1,74 @@
+;; 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 loading-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 <loading-page>))
+ (let ((builder
+ (builder:new-from-file
+ (string-append config:uidir "/loading-page.glade"))))
+ (let ((main-widget
+ (builder:get-object builder "loading_page"))
+ (uri-entry
+ (builder:get-object builder "uri_entry")))
+ (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))))