Merge branch 'master' of code-repo.d4science.org:MaDgIK/graph

angular.json

@@ -44,7 +44,8 @@
             "assets": [
               "src/assets",
               "src/robots.txt",
-              "src/sitemap.xml"
+              "src/sitemap.xml",
+              "src/.htaccess"
             ],
             "styles": [
               "src/styles.css",

src/.htaccess

@@ -0,0 +1,10 @@
+RewriteEngine On
+    # If an existing asset or directory is requested go to it as it is
+    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
+    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
+    RewriteRule ^ - [L]
+
+    # If the requested resource doesn't exist, use index.html
+RewriteRule ^ ./index.html
+
+

src/app/about/team.ts

@@ -17,14 +17,6 @@ export const team: member[] = [
     responsibilities: 'Design and operation of the pipeline for the materialisation and data quality evaluation of the graph.',
     photo: 'alessia.jpg'
   },
-  {
-    name: 'Amelie Bäcker',
-    role: 'Librarian',
-    affiliation: 'Bielefeld University Library',
-    country: 'Germany',
-    responsibilities: 'Metadata integration (standard cases), helpdesk support (OpenAIRE Guidelines, metadata integration).',
-    photo: 'amelie.jpg'
-  },
   {
     name: 'Andrea Dell Amico',
     role: 'Τechnical Team - Systems Administrator',
@@ -99,16 +91,16 @@ export const team: member[] = [
   },
   {
     name: 'Miriam Baglioni',
-    role: 'Researcher / Software & Data Engineer / Data quality',
+    role: 'Researcher / Data Quality',
     affiliation: 'Institute of Information Science and Technologies, Italian National Research Council',
     country: 'Italy',
-    responsibilities: 'Graph enrichment steps (not related to mining), and production of the graph dumps.',
-    photo: 'miriam.jpeg'
+    responsibilities: 'Design and operation of the pipeline for the materialization and data quality evaluation of the graph.',
+    photo: 'miriam.png'
   },
   {
     name: 'Paolo Manghi',
     role: 'Chief Technical Officer',
-    affiliation: 'Institute of Information Science and Technologies, Italian National Research Council',
+    affiliation: 'OpenAIRE AMKE / CNR, Institute of Information Science and Technologies',
     country: 'Italy',
     responsibilities: 'Design, roadmapping of the OpenAIRE infrastructure services, their operation, evolution, and interaction with third-parties.',
     photo: 'paolo.png'
@@ -128,5 +120,61 @@ export const team: member[] = [
     country: 'Greece',
     responsibilities: 'Implementation of Text and Data Mining (TDM) modules used in the graph Enrichment phase.',
     photo: 'yiannis.jpg'
-  }
+  },
+	{
+    name: 'Thanasis Vergoulis',
+    role: 'Service Operational Director',
+    affiliation: 'OpenAIRE AMKE',
+    country: 'Greece',
+    responsibilities: 'Technical roadmap management and supervision, ensuring quality of services.',
+    photo: 'thanasis.png'
+  },
+	{
+    name: 'Marek Horst',
+    role: 'Virtual Access Manager and Infrastructure Manager',
+    affiliation: 'ICM, University of Warsaw',
+    country: 'Poland',
+    responsibilities: 'Quality of services, OpenAIRE Mining Infrastructure manager.',
+    photo: 'marek.jpg'
+  },
+	{
+    name: 'Michele Artini',
+    role: 'Software & Data Engineer / Data Quality',
+    affiliation: 'Institute of Information Science and Technologies, Italian National Research Council',
+    country: 'Italy',
+    responsibilities: 'OpenOrgs design and development, software developer for Graph generation workflows and related micro-services.',
+    photo: 'michele.png'
+  },
+	{
+    name: 'Michal Politowski',
+    role: 'Technical Team - Systems Administrator',
+    affiliation: 'ICM, University of Warsaw',
+    country: 'Poland',
+    responsibilities: 'Quality of services, software updates,  service operation management, deployment and monitoring of services.',
+    photo: 'michal.png'
+  },
+	{
+    name: 'Ioanna Grypari',
+    role: 'Data Analyst / OpenAIRE Observatory, OpenAIRE MONITOR product manager',
+    affiliation: 'Athena Research Center (ARC)',
+    country: 'Greece',
+    responsibilities: 'Analysis of the data to identify Open Science indicators for funders, research communities, institutions, and scientists.',
+    photo: 'ioanna.jpg'
+  },
+	{
+    name: 'Serafeim Chatzopoulos',
+    role: 'Researcher /Software & Data Engineer',
+    affiliation: 'OpenAIRE AMKE',
+    country: 'Greece',
+    responsibilities: 'Software developer for Graph generation workflows and related micro-services.',
+    photo: 'serafeim.jpg'
+  },
+	{
+    name: 'Gina Pavone',
+    role: 'Open Science expert / Data Quality',
+    affiliation: 'Institute of Information Science and Technologies, Italian National Research Council',
+    country: 'Italy',
+    responsibilities: 'Validating graph data quality, deduplication of organizations.',
+    photo: 'gina.jpg'
+  },
 ]

src/app/app.component.html

@@ -22,7 +22,7 @@
     Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing
     experience possible.
     By using the OpenAIRE portal you accept our use of cookies. <a
-      href="//ec.europa.eu/ipg/basics/legal/cookies/index_en.htm" target="_blank"> Read more <span class="uk-icon">
+      href="https://www.openaire.eu/privacy-policy#cookies" target="_blank"> Read more <span class="uk-icon">
     <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline
         fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
     </span></a>

src/app/app.component.ts

@@ -61,13 +61,17 @@ export class AppComponent implements OnInit, OnDestroy {
           new MenuItem("team", "Team", "", "/about", false, [], null, {}, null, 'team')
         ]
       },
-      {
-        rootItem: new MenuItem("resources", "Resources", "", "/resources", false, [], null, {}),
-        items: [
-          new MenuItem("api", "API", "", "/resources", false, [], null, {}),
-          new MenuItem("references", "References", "", "/resources/references", false, [], null, {})
-        ]
-      },
+			{
+				rootItem: new MenuItem("resources", "API & Resources", "/develop/overview.html", "", false, [], null, {}),
+				items: [
+					new MenuItem("resources", "Overview", "/develop/overview.html", "", false, [], null, {}),
+					new MenuItem("", "Authentication", "/develop/authentication.html", "", false, [], null, {}),
+					new MenuItem("", "Bulk Access", "/develop/graph-dumps.html", "", false, [], null, {}),
+					new MenuItem("", "Selective Access", "/develop/api.html", "", false, [], null, {}),
+					new MenuItem("", "Response Metadata Format", "/develop/response-metadata-format.html", "", false, [], null, {}),
+					new MenuItem("references", "References", "/resources/references", "", false, [], null, {}),
+				]
+			},
       {
         rootItem: new MenuItem("contact", "Support", "", "/support", false, [], null, {}),
         items: []

src/app/home/home.component.html

@@ -218,7 +218,7 @@
   <div class="services">
     <div class="uk-section uk-container uk-container-large">
       <div class="uk-padding-small">
-        <h2>Products & Services</h2>
+        <h2>Research Graph is used in OpenAIRE services</h2>
         <div class="service-slide uk-position-relative">
           <div *ngFor="let portal of portals; let i=index;" [class.fade-out]="i !== state" [class.fade-in]="i === state"
                class="uk-margin-medium-top uk-grid uk-grid-large uk-child-width-1-2@m uk-position-top" uk-grid>

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 2007e129664da2e7893aab97b5736cf92585f32d
+Subproject commit 3c1429f6b70c9d38f2f7cfbf45716cb594a1019f

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit ffc664c3672226fb16eacb4886a3f328f5bf1d33
+Subproject commit 04d799f089c93ae28c9d2ca8436f283ebc0be3ae

src/sitemap.xml

@@ -10,9 +10,42 @@
       <loc>https://graph.openaire.eu/about/team</loc>
    </url>
    <url>
-      <loc>https://graph.openaire.eu/resources</loc>
+      <loc>https://graph.openaire.eu/develop/overview.html</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/develop/authentication.html</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/develop/personalToken.html</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/develop/registeredService.html</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/develop/basic.html</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/develop/advanced.html</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/develop/graph-dumps.html</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/develop/graph-dumps-old.html</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/develop/bulk-projects.html</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/develop/api.html</loc>
+   </url>
+	  <url>
+      <loc>https://graph.openaire.eu/develop/response-metadata-format.html</loc>
    </url>
    <url>
       <loc>https://graph.openaire.eu/resources/references</loc>
+   </url>
+	 <url>
+      <loc>https://graph.openaire.eu/support</loc>
    </url>
 </urlset>