diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index a1baf444b5e540b0fde2664fddb407793ab1125b..fb46dfc0ce3e9e28b0cc378ec0638106a505c588 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -21,7 +21,7 @@ div.block_list
                 div.button_base.ico_gauche.ico_plus Post a new Resource
 
         div.dashboard__database
-            sib-link(next='mentor-database')
+            sib-link(next='public-dashboard')
                 div.button_base.ico_gauche.ico_database Browse database
 
     div.tabs
diff --git a/src/includes/public/components/header.pug b/src/includes/public/components/header.pug
index ac670d151c8003d1f5e3130ba7df31990364e565..59f5c96199fc111ef199f57c8bdcd1aea63c2883 100644
--- a/src/includes/public/components/header.pug
+++ b/src/includes/public/components/header.pug
@@ -17,4 +17,3 @@
               naked
             )
             input.ico_droite.ico_search  
-            
diff --git a/src/includes/public/dashboard.pug b/src/includes/public/dashboard.pug
index ff156e4725b9f3227bd9eabede8d394146442e13..0b21eda2decf3bed8c317c7ca001da650779670b 100644
--- a/src/includes/public/dashboard.pug
+++ b/src/includes/public/dashboard.pug
@@ -7,10 +7,18 @@ header#header(role='banner')
     include ./components/header.pug
 
 section#home
-
-    #public-resource-list(hidden).no-sidebar.container
+    
+    #public-resource-list.no-sidebar.container
         include ./resources/list.pug
 
+        sib-router
+            sib-route(id-prefix=`${endpoints.resources}`, name='public-resource-detail', use-id)
+
+        dialog#public-resource-detail.no-sidebar
+            include resources/detail.pug
+
+
+
 
 
 
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ad77c839696d2ab7b0832be84523515a79293d0e 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -0,0 +1,122 @@
+include ../../components/widgets
+
+.block_log.block_creat_count.no_shadow
+  sib-link(class="backlink", next="public-resource-list")
+    .like
+      p.backlink 
+        i.fas.fa-times
+
+  div#detail-public-loader
+    hidden Loading resources, please wait...
+
+  sib-display(
+    loader-id="detail-public-loader"
+    bind-resources,
+    fields='name, steps, format,\
+            submitter_info(submitter.account.picture, submitter.name, \
+            submitter.mentor_profile.organisation.name, skills, uri, broken),\
+            content(preview_image, tags),\
+            description, review.reviewer.account.picture, review.reviewer.name,\
+            copyright, specifications(\
+            header_specifications, author, country, language.name,\
+            publication_year, fields, sharing)',
+
+    widget-submitter.name='cs-display-resource-property',
+    class-name="title_form"
+    class-steps="steps"
+    widget-author='cs-display-resource-property',
+    widget-country='cs-display-resource-property',
+    widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+    class-submitter.name="autor_ressource"
+    class-broken="broken"
+    widget-format='cs-display-multiple-property'
+    widget-uri='cs-display-link'
+    class-uri="pull-left"
+    widget-skills='cs-display-resource-property'
+    widget-description='cs-display-property'
+    widget-name='cs-display-property'
+    widget-publication_year='cs-display-resource-property'
+    widget-sharing='cs-display-resource-property'
+    widget-language.name='cs-display-resource-property'
+    widget-submitter.account.picture='cs-account-picture'
+    widget-broken='cs-broken-action'
+    widget-preview_image='cs-preview-picture'
+    widget-review.reviewer.account.picture='cs-account-picture'
+    widget-review.reviewer.name='cs-resource-reviewer'
+    class-review.reviewer.name="validator_ressource"
+    widget-header_specifications='cs-section_header'
+    
+    label-broken='Report broken link'
+    label-sharing='Access:'
+    label-language.name='Language:'
+    label-publication_year='Year of publication:'
+    label-header_specifications='Resource specifications'
+    each-label-format=''
+    label-format=''
+    multiple-format
+
+    widget-steps='cs-display-step-property'
+    label-steps=''
+    each-label-steps="Step"
+    multiple-steps
+
+    widget-fields='cs-display-multiple-property'
+    label-fields=''
+    each-label-fields='Field:'
+    multiple-fields
+
+    label-skills='With this resource, you will be able to:'
+    label-uri='Link to resource'
+    name-uri='original-link'
+    label-country='Country:'
+    label-submitter.mentor_profile.organisation.name='Organisation:'
+    label-author='Author :'
+    label-submitter.name='Resource posted by:'
+    action-broken='resource-report-broken-link'
+  )
+
+  //- Add likes here
+  <div class="like">
+    <p class="backlink"><i class='far fa-thumbs-up'></i>18</p>
+    <p class="backlink"><i class='far fa-thumbs-down'></i>3</p>
+  </div>
+
+  sib-display(
+    bind-resources
+    fields=""
+    nested-field="likes"
+    counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>"
+  )
+
+  sib-display(
+    bind-resources
+    fields=""
+    nested-field="dislikes"
+    counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
+  )
+
+  sib-display(
+    bind-resources
+    fields=""
+    nested-field="conversations"
+    counter-template="<p>Comments (${counter})</p>"
+  )
+
+  sib-conversation(
+    bind-resources
+    id-suffix="conversations"
+  )
+
+  h2.title_lead_avenir Related resources
+
+  sib-display(
+    bind-resources,
+    nested-field="related"
+    fields="name, detail"
+
+    widget-name='cs-display-property'
+    label-detail=''
+    widget-detail='sib-action'
+    action-detail='public-resource-detail'
+  )
+
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index 1b25577a8dfb027afc049aaf08f5b0ae9aa51b5f..c7c50a9730f5dffc691c24804e3a516e4d722fa1 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -128,7 +128,7 @@ container.block_list.flex.flex_espace
                 widget-description='cs-display-property'
                 widget-fields='hidden-widget'
                 widget-language="hidden-widget"
-                widget-author="cs-display-property"
+                widget-author="hidden-widget"
                 widget-format='cs-display-multiple-property'
                 label-format=''
                 multiple-format
@@ -136,6 +136,8 @@ container.block_list.flex.flex_espace
                 multiple-language
                 label-fields=''
                 multiple-fields
+
+                next='public-resource-detail'
                 
                 paginate-by="5"
             )
@@ -179,7 +181,7 @@ container.block_list.flex.flex_espace
                 widget-description='cs-display-property'
                 widget-fields='hidden-widget'
                 widget-language="hidden-widget"
-                widget-author="cs-display-property"
+                widget-author="hidden-widget"
                 widget-format='cs-display-multiple-property'
                 label-format=''
                 multiple-format
@@ -187,6 +189,8 @@ container.block_list.flex.flex_espace
                 multiple-language
                 label-fields=''
                 multiple-fields
+
+                next='public-resource-detail'
                 
                 paginate-by="5"
             )
@@ -230,7 +234,7 @@ container.block_list.flex.flex_espace
                 widget-description='cs-display-property'
                 widget-fields='hidden-widget'
                 widget-language="hidden-widget"
-                widget-author="cs-display-property"
+                widget-author="hidden-widget"
                 widget-format='cs-display-multiple-property'
                 label-format=''
                 multiple-format
@@ -238,6 +242,8 @@ container.block_list.flex.flex_espace
                 multiple-language
                 label-fields=''
                 multiple-fields
+
+                next='public-resource-detail'
                 
                 paginate-by="5"
             )
@@ -282,7 +288,7 @@ container.block_list.flex.flex_espace
                 widget-description='cs-display-property'
                 widget-fields='hidden-widget'
                 widget-language="hidden-widget"
-                widget-author="cs-display-property"
+                widget-author="hidden-widget"
                 widget-format='cs-display-multiple-property'
                 label-format=''
                 multiple-format
@@ -290,6 +296,8 @@ container.block_list.flex.flex_espace
                 multiple-language
                 label-fields=''
                 multiple-fields
+
+                next='public-resource-detail'
                 
                 paginate-by="5"
             )
@@ -333,7 +341,7 @@ container.block_list.flex.flex_espace
                 widget-description='cs-display-property'
                 widget-fields='hidden-widget'
                 widget-language="hidden-widget"
-                widget-author="cs-display-property"
+                widget-author="hidden-widget"
                 widget-format='cs-display-multiple-property'
                 label-format=''
                 multiple-format
@@ -341,6 +349,8 @@ container.block_list.flex.flex_espace
                 multiple-language
                 label-fields=''
                 multiple-fields
+
+                next='public-resource-detail'
                 
                 paginate-by="5"
             )