From c676cef9036c686d14690f9bb5df7a9da5f32e7a Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Wed, 4 Sep 2019 16:59:21 +0200
Subject: [PATCH 1/2] feature: Add header and resources in entrepreneur
dashboard.
---
.../entrepreneur/components/header.pug | 26 +++++++++++++++++++
src/includes/entrepreneur/components/menu.pug | 4 +++
src/includes/entrepreneur/dashboard.pug | 12 ++++++---
src/includes/entrepreneur/resources/list.pug | 8 +++---
src/includes/mentor/dashboard.pug | 4 +--
src/styles/index.scss | 4 ---
6 files changed, 46 insertions(+), 12 deletions(-)
create mode 100644 src/includes/entrepreneur/components/menu.pug
diff --git a/src/includes/entrepreneur/components/header.pug b/src/includes/entrepreneur/components/header.pug
index e69de29b..2efbe86c 100644
--- a/src/includes/entrepreneur/components/header.pug
+++ b/src/includes/entrepreneur/components/header.pug
@@ -0,0 +1,26 @@
+.container
+ .flex.flex_espace.flex_item_center
+ sib-link(next='entrepreneur-resource-list')
+ figure.logo_head.margin_bord_ecran
+ img(src="../images/logo_head.png" alt="Coopstarter")
+
+ include menu.pug
+
+ div.flex.flex_espace.flex_item_center
+ sib-form(
+ data-src=`${endpoints.languages}`
+ fields='languages'
+ range-languages=`${endpoints.languages}`
+ widget-languages='sib-form-dropdown'
+ selected-languages=`${endpoints.languages}/1/`
+ label-languages=''
+ naked
+ )
+ input.ico_droite.ico_search
+
+ sib-link(next='entrepreneur-account')
+ sib-display#user-account-picture(
+ bind-user
+ fields='account.picture',
+ widget-account.picture='cs-account-picture'
+ )
\ No newline at end of file
diff --git a/src/includes/entrepreneur/components/menu.pug b/src/includes/entrepreneur/components/menu.pug
new file mode 100644
index 00000000..79869cdc
--- /dev/null
+++ b/src/includes/entrepreneur/components/menu.pug
@@ -0,0 +1,4 @@
+sib-router(default-route='entrepreneur-resource-list')
+ sib-route(name='entrepreneur-resource-list')
+ sib-route(name='entrepreneur-account', id-prefix=`${endpoints.users}`, use-id)
+
\ No newline at end of file
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index 4bf507f1..2a7cf558 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -4,9 +4,10 @@
// Like and comment
header#header(role='banner')
- include components/header.pug
+ include ./components/header.pug
section#home
+
h1 Mentorship program
p International index of resources for cooperative mentors and entrepreneurs
@@ -18,5 +19,10 @@ section#home
// From two different endpoints I guess
//-Work on the page architecture
- #entrepreneur-resource-list(hidden)
- include resources/list.pug
\ No newline at end of file
+
+ //TODO : investigate why we have to remove hidden attribute to see this even if we are on the right route.
+ #entrepreneur-resource-list()
+ include ./resources/list.pug
+
+ #entrepreneur-account(hidden)
+ h2 account
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 30576314..40b07321 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -1,3 +1,5 @@
+include ../../components/widgets
+
p: a Watch a video presentation
h2 Search for a resource
@@ -5,14 +7,14 @@ h2 Search for a resource
#circles
sib-display#circles-list(
data-src=`${endpoints.resources}`,
- fields='content(title, description), format, info(author, publication_year, language.name), steps',
- search-fields='title, description, format',
+ fields='name, description, format, info(author, publication_year, language.name), steps',
+ search-fields='name, description, format',
widget-format='cs-resource-format-name',
multiple-format,
widget-steps='cs-resource-format-name',
multiple-steps,
- group-by='steps'
+ paginate-by="1"
next='detail'
)
\ No newline at end of file
diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug
index 0d01061a..cb145522 100644
--- a/src/includes/mentor/dashboard.pug
+++ b/src/includes/mentor/dashboard.pug
@@ -33,9 +33,9 @@ section#home
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
include resources/detail.pug
- #mentor-database
+ #mentor-database(hidden)
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
- include ../entrepreneur/dashboard.pug
+ include resources/list.pug
#mentor-account(hidden).no-sidebar.container
include profile.pug
diff --git a/src/styles/index.scss b/src/styles/index.scss
index faf7274e..74a46edf 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -881,8 +881,4 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
b, strong {
font-weight: bolder;
-}
-
-div{
-
}
\ No newline at end of file
--
GitLab
From 64dad8c223688c6a0729c00fe24925e6cd82f1d1 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Wed, 4 Sep 2019 17:00:33 +0200
Subject: [PATCH 2/2] feature: Request creation link in entrepreneur dashboard.
---
src/includes/entrepreneur/dashboard.pug | 6 ++++++
src/includes/entrepreneur/requests/create.pug | 3 +++
src/includes/entrepreneur/resources/list.pug | 9 ++++++++-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index 2a7cf558..442c9cbe 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -24,5 +24,11 @@ section#home
#entrepreneur-resource-list()
include ./resources/list.pug
+ sib-router
+ sib-route(name='entrepreneur-request-create')
+
+ dialog#entrepreneur-request-create.no-sidebar.container
+ include ./requests/create.pug
+
#entrepreneur-account(hidden)
h2 account
diff --git a/src/includes/entrepreneur/requests/create.pug b/src/includes/entrepreneur/requests/create.pug
index e69de29b..e036b4d3 100644
--- a/src/includes/entrepreneur/requests/create.pug
+++ b/src/includes/entrepreneur/requests/create.pug
@@ -0,0 +1,3 @@
+p That's work
+
+ sib-link(class="backlink", next="entrepreneur-resource-list") Back to the dashboard
\ No newline at end of file
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 40b07321..3270dd35 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -17,4 +17,11 @@ h2 Search for a resource
paginate-by="1"
next='detail'
- )
\ No newline at end of file
+ )
+
+div.side-block
+ p Can't find the ressource you need ?
+ div.button__actions
+ sib-link(next='entrepreneur-request-create')
+ div
+ div.button_base.ico_gauche.ico_plus Make a request
\ No newline at end of file
--
GitLab