release v4.0.0

unnecessary because the react component which is handling this id is generating
the html code.

.editorconfig

@@ -15,15 +15,6 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
-# Python files
-[*.py]
-indent_size = 4
-# isort plugin configuration
-known_first_party = invenio_theme_tugraz
-multi_line_output = 2
-default_section = THIRDPARTY
-skip = .eggs
-
 # RST files (used by sphinx)
 [*.rst]
 indent_size = 4

.git-blame-ignore-revs

@@ -0,0 +1 @@
+cd71ecd24b8fc2253a58c60082c80a87c8085601

.github/workflows/pypi-publish.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools wheel
+          pip install setuptools wheel babel
       - name: Build package
         run: |
           python setup.py compile_catalog sdist bdist_wheel

.github/workflows/tests.yml

@@ -1,3 +1,11 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2020-2022 Graz University of Technology.
+#
+# invenio-theme-tugraz is free software; you can redistribute it and/or
+# modify it under the terms of the MIT License; see LICENSE file for more
+# details.
+
 name: CI
 
 on:
@@ -20,42 +28,18 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-          python-version: [3.6, 3.7, 3.8, 3.9]
+          python-version: [3.8, 3.9]
-          requirements-level: [min, pypi]
+          requirements-level: [pypi]
-          db-service: [postgresql12]
+          db-service: [postgresql13]
           search-service: [elasticsearch7]
-          exclude:
-          - python-version: 3.6
-            requirements-level: pypi
-
-          - python-version: 3.7
-            requirements-level: min
-
-          - python-version: 3.8
-            requirements-level: min
-
-          - python-version: 3.9
-            requirements-level: min
-
-          - db-service: postgresql12
-            requirements-level: min
-
-          - search-service: elasticsearch7
-            requirements-level: min
-
           include:
-
-          - db-service: postgresql12
-            DB_EXTRAS: "postgresql"
-
-
           - search-service: elasticsearch7
             SEARCH_EXTRAS: "elasticsearch7"
 
     env:
       DB: ${{ matrix.db-service }}
       SEARCH: ${{ matrix.search-service }}
-      EXTRAS: all,${{ matrix.DB_EXTRAS }},${{ matrix.SEARCH_EXTRAS }}
+      EXTRAS: tests,${{ matrix.SEARCH_EXTRAS }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -67,7 +51,7 @@ jobs:
 
       - name: Generate dependencies
         run: |
-          python -m pip install --upgrade pip setuptools py wheel requirements-builder
+          pip install wheel requirements-builder
           requirements-builder -e "$EXTRAS" --level=${{ matrix.requirements-level }} setup.py > .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
       - name: Cache pip
         uses: actions/cache@v2

.tx/config

@@ -5,6 +5,11 @@
 # invenio-theme-tugraz is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
 # details.
+#
+# 1) Create message catalog:
+#    $ python setup.py extract_messages
+#    $ python setup.py update_catalog -l de
+#    $ python setup.py compile_catalog
 
 [main]
 host = https://www.transifex.com

CHANGES.rst

@@ -7,9 +7,32 @@
 
 Changes
 =======
-Version 3.7.1.dev2 (released 2022-01-13)
 
-- modify: override record deposit template and increase upload size #256
+Version v4.0.0 (release 2022-07-29)
+
+- remove unnecessary html code for header-search-bar
+- fix warning from semantic-ui-react Search component
+- add marc21 and lom to the searchbar
+- change searchbar layout and use invenio-app-rdm searchbar
+- remove grey color of community block and reduce size
+- migrate js to use prettier
+
+Version 3.9.2 (released 2022-06-28)
+
+- fix: adopt renaming of serialize function (#269)
+
+Version 3.9.1 (released 2022-06-02)
+
+- fix: add trigger to accordion (#265)
+- dep: adapt to v9 of invenioRDM(#263)
+
+Version 3.9.0 (released 2022-05-27)
+
+- global: migrate setup.py to setup.cfg #260 
+
+Version 3.8.0 (released 2022-03-03)
+
+- global: migrate to v8 of invenioRDM #257
 
 Version 3.7.0 (released 2021-12-07)
 

MANIFEST.in

@@ -41,3 +41,4 @@ recursive-include tests *.py
 recursive-include invenio_theme_tugraz *.jpg
 recursive-include invenio_theme_tugraz *.gitkeep
 recursive-include .github/workflows *.yml
+include .git-blame-ignore-revs

docs/conf.py

@@ -8,7 +8,7 @@
 
 """Sphinx configuration."""
 
-import os
+from invenio_theme_tugraz import __version__
 
 # -- General configuration ------------------------------------------------
 
@@ -44,9 +44,9 @@ source_suffix = ".rst"
 master_doc = "index"
 
 # General information about the project.
-project = u"invenio-theme-tugraz"
+project = "invenio-theme-tugraz"
-copyright = u"2020, Graz University of Technology"
+copyright = "2020, Graz University of Technology"
-author = u"Graz University of Technology"
+author = "Graz University of Technology"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -54,17 +54,8 @@ author = u"Graz University of Technology"
 #
 # The short X.Y version.
 
-# Get the version string. Cannot be done with import!
-g = {}
-with open(
-    os.path.join(os.path.dirname(__file__), "..", "invenio_theme_tugraz", "version.py"),
-    "rt",
-) as fp:
-    exec(fp.read(), g)
-    version = g["__version__"]
-
 # The full version, including alpha/beta/rc tags.
-release = version
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -250,8 +241,8 @@ latex_documents = [
     (
         master_doc,
         "invenio-theme-tugraz.tex",
-        u"invenio-theme-tugraz Documentation",
+        "invenio-theme-tugraz Documentation",
-        u"Graz University of Technology",
+        "Graz University of Technology",
         "manual",
     ),
 ]
@@ -285,7 +276,7 @@ man_pages = [
     (
         master_doc,
         "invenio-theme-tugraz",
-        u"invenio-theme-tugraz Documentation",
+        "invenio-theme-tugraz Documentation",
         [author],
         1,
     )
@@ -304,7 +295,7 @@ texinfo_documents = [
     (
         master_doc,
         "invenio-theme-tugraz",
-        u"invenio-theme-tugraz Documentation",
+        "invenio-theme-tugraz Documentation",
         author,
         "invenio-theme-tugraz",
         "invenio module for TUGRAZ theme.",

invenio_theme_tugraz/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020-2021 Graz University of Technology.
+# Copyright (C) 2020-2022 Graz University of Technology.
 #
 # invenio-theme-tugraz is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -9,6 +9,7 @@
 """invenio module for TUGRAZ theme."""
 
 from .ext import InvenioThemeTugraz
-from .version import __version__
+
+__version__ = "4.0.0"
 
 __all__ = ("__version__", "InvenioThemeTugraz")

invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/RDMDepositForm.js

@@ -1,398 +0,0 @@
-// This file is part of InvenioRDM
-// Copyright (C) 2020 CERN.
-// Copyright (C) 2020 Northwestern University.
-// Copyright (C) 2022 Graz University of Technology.
-//
-// Invenio App RDM is free software; you can redistribute it and/or modify it
-// under the terms of the MIT License; see LICENSE file for more details.
-
-import _get from "lodash/get";
-import React, { Component, createRef, Fragment } from "react";
-import {
-  AccessRightField,
-  CreatibutorsField,
-  DatesField,
-  DeleteButton,
-  DepositFormApp,
-  DepositFormTitle,
-  DescriptionsField,
-  FileUploader,
-  FormFeedback,
-  IdentifiersField,
-  LanguagesField,
-  SubjectsField,
-  LicenseField,
-  PIDField,
-  PreviewButton,
-  PublicationDateField,
-  PublishButton,
-  PublisherField,
-  RelatedWorksField,
-  ResourceTypeField,
-  SaveButton,
-  TitlesField,
-  VersionField,
-} from "react-invenio-deposit";
-import { AccordionField } from "react-invenio-forms";
-import { Card, Container, Divider, Grid, Ref, Sticky } from "semantic-ui-react";
-import { i18next } from "@translations/invenio_app_rdm/i18next";
-
-export class RDMDepositForm extends Component {
-  constructor(props) {
-    super(props);
-    this.config = props.config || {};
-    // TODO: retrieve from backend
-    this.config["canHaveMetadataOnlyRecords"] = true;
-
-    // TODO: Make ALL vocabulary be generated by backend.
-    // Currently, some vocabulary is generated by backend and some is
-    // generated by frontend here. Iteration is faster and abstractions can be
-    // discovered by generating vocabulary here. Once happy with vocabularies,
-    // then we can generate it in the backend.
-    this.vocabularies = {
-      metadata: {
-        ...this.config.vocabularies,
-
-        creators: {
-          ...this.config.vocabularies.creators,
-          type: [
-            { text: "Person", value: "personal" },
-            { text: "Organization", value: "organizational" },
-          ],
-        },
-
-        contributors: {
-          ...this.config.vocabularies.creators,
-          type: [
-            { text: "Person", value: "personal" },
-            { text: "Organization", value: "organizational" },
-          ],
-        },
-
-        // TODO: Replace with an API backend
-        funding: {
-          funder: [
-            {
-              name: "National Institutes of Health (US)",
-              identifier: "funder1",
-              scheme: "funderScheme1",
-            },
-            {
-              name: "European Commission (EU)",
-              identifier: "funder2",
-              scheme: "funderScheme2",
-            },
-          ],
-          award: [
-            {
-              title: "CANCER &AIDS DRUGS--PRECLIN PHARMACOL/TOXICOLOGY",
-              number: "N01CM037835-016",
-              identifier: "awardA",
-              scheme: "awardSchemeA",
-              parentScheme: "funderScheme1",
-              parentIdentifier: "funder1",
-            },
-            {
-              title:
-                "Beyond the Standard Model at the LHC and with Atom Interferometers.",
-              number: "228169",
-              identifier: "awardB1",
-              scheme: "awardSchemeB",
-              parentScheme: "funderScheme2",
-              parentIdentifier: "funder2",
-            },
-            {
-              title: "ENvironmental COnditions in GLAucoma Patients",
-              number: "747441",
-              identifier: "awardB2",
-              scheme: "awardSchemeB",
-              parentScheme: "funderScheme2",
-              parentIdentifier: "funder2",
-            },
-          ],
-        },
-        identifiers: {
-          ...this.config.vocabularies.identifiers,
-        },
-      },
-    };
-
-    // check if files are present
-    this.noFiles = false;
-    if (
-      !Array.isArray(this.props.files.entries) ||
-      (!this.props.files.entries.length && this.props.record.is_published)
-    ) {
-      this.noFiles = true;
-    }
-  }
-
-  formFeedbackRef = createRef();
-  sidebarRef = createRef();
-
-  accordionStyle = {
-    header: { className: "inverted brand", style: { cursor: "pointer" } },
-  };
-
-  render() {
-    return (
-      <DepositFormApp
-        config={this.config}
-        record={this.props.record}
-        files={this.props.files}
-        permissions={this.props.permissions}
-      >
-        <FormFeedback fieldPath="message" />
-        <Container style={{ marginTop: "10px" }}>
-          <DepositFormTitle />
-          <Grid>
-            <Grid.Row>
-              <Grid.Column width={11}>
-                <AccordionField
-                  fieldPath=""
-                  active={true}
-                  label={i18next.t("Files")}
-                  ui={this.accordionStyle}
-                >
-                  {this.noFiles && this.props.record.is_published && (
-                    <p
-                      style={{
-                        textAlign: "center",
-                        opacity: "0.5",
-                        cursor: "default !important",
-                      }}
-                    >
-                      <em>{i18next.t("The record has no files.")}</em>
-                    </p>
-                  )}
-                  <FileUploader
-                    isDraftRecord={!this.props.record.is_published}
-                    quota={{
-                      maxFiles: 100,
-                      maxStorage: 10 ** 11,
-                    }}
-                  />
-                </AccordionField>
-
-                <AccordionField
-                  fieldPath=""
-                  active={true}
-                  label={i18next.t("Basic information")}
-                  ui={this.accordionStyle}
-                >
-                  {this.config.pids.map((pid) => (
-                    <Fragment key={pid.scheme}>
-                      <PIDField
-                        btnLabelDiscardPID={pid.btn_label_discard_pid}
-                        btnLabelGetPID={pid.btn_label_get_pid}
-                        canBeManaged={pid.can_be_managed}
-                        canBeUnmanaged={pid.can_be_unmanaged}
-                        fieldPath={`pids.${pid.scheme}`}
-                        fieldLabel={pid.field_label}
-                        isEditingPublishedRecord={
-                          this.props.record.is_published === true // is_published is `null` at first upload
-                        }
-                        managedHelpText={pid.managed_help_text}
-                        pidLabel={pid.pid_label}
-                        pidPlaceholder={pid.pid_placeholder}
-                        pidType={pid.scheme}
-                        unmanagedHelpText={pid.unmanaged_help_text}
-                        required
-                      />
-                      <Divider />
-                    </Fragment>
-                  ))}
-
-                  <ResourceTypeField
-                    options={this.vocabularies.metadata.resource_type}
-                    required
-                  />
-                  <TitlesField
-                    options={this.vocabularies.metadata.titles}
-                    recordUI={this.props.record.ui}
-                    required
-                  />
-                  <PublicationDateField required />
-                  <CreatibutorsField
-                    label={i18next.t("Creators")}
-                    labelIcon={"user"}
-                    fieldPath={"metadata.creators"}
-                    roleOptions={this.vocabularies.metadata.creators.role}
-                    schema="creators"
-                    required
-                  />
-                  <DescriptionsField
-                    options={this.vocabularies.metadata.descriptions}
-                    recordUI={_get(this.props.record, "ui", null)}
-                    editorConfig={{
-                      removePlugins: [
-                        "Image",
-                        "ImageCaption",
-                        "ImageStyle",
-                        "ImageToolbar",
-                        "ImageUpload",
-                        "MediaEmbed",
-                        "Table",
-                        "TableToolbar",
-                        "TableProperties",
-                        "TableCellProperties",
-                      ],
-                    }}
-                  />
-                  <LicenseField
-                    fieldPath="metadata.rights"
-                    searchConfig={{
-                      searchApi: {
-                        axios: {
-                          headers: {
-                            Accept: "application/vnd.inveniordm.v1+json",
-                          },
-                          url: "/api/vocabularies/licenses",
-                          withCredentials: false,
-                        },
-                      },
-                      initialQueryState: {
-                        filters: [["tags", "recommended"]],
-                      },
-                    }}
-                    serializeLicenses={(result) => ({
-                      title: result.title_l10n,
-                      description: result.description_l10n,
-                      id: result.id,
-                      link: result.props.url,
-                    })}
-                  />
-                  <br />
-                </AccordionField>
-
-                <AccordionField
-                  fieldPath=""
-                  active={true}
-                  label={i18next.t("Recommended information")}
-                  ui={this.accordionStyle}
-                >
-                  <CreatibutorsField
-                    addButtonLabel={i18next.t("Add contributor")}
-                    label={i18next.t("Contributors")}
-                    labelIcon={"user plus"}
-                    fieldPath={"metadata.contributors"}
-                    roleOptions={this.vocabularies.metadata.contributors.role}
-                    schema="contributors"
-                    modal={{
-                      addLabel: "Add contributor",
-                      editLabel: "Edit contributor",
-                    }}
-                  />
-                  <SubjectsField
-                    initialOptions={_get(
-                      this.props.record,
-                      "ui.subjects",
-                      null
-                    )}
-                    limitToOptions={
-                      this.vocabularies.metadata.subjects.limit_to
-                    }
-                  />
-
-                  <LanguagesField
-                    initialOptions={_get(
-                      this.props.record,
-                      "ui.languages",
-                      []
-                    ).filter((lang) => lang !== null)} // needed because dumped empty record from backend gives [null]
-                    serializeSuggestions={(suggestions) =>
-                      suggestions.map((item) => ({
-                        text: item.title_l10n,
-                        value: item.id,
-                        key: item.id,
-                      }))
-                    }
-                  />
-                  <DatesField options={this.vocabularies.metadata.dates} />
-                  <VersionField />
-                  <PublisherField />
-                  <br />
-                </AccordionField>
-                {/**TODO: uncomment to use FundingField*/}
-                {/* <AccordionField
-                fieldPath=""
-                active={true}
-                label={"Funding"}
-                ui={this.accordionStyle}
-                >
-                <FundingField options={this.vocabularies.metadata.funding} />
-                <ComingSoonField
-                  fieldPath="metadata.funding"
-                  label="Awards"
-                  labelIcon="money bill alternate outline"
-                />
-
-                <br />
-                </AccordionField> */}
-
-                <AccordionField
-                  fieldPath=""
-                  active={true}
-                  label={i18next.t("Alternate identifiers")}
-                  ui={this.accordionStyle}
-                >
-                  <IdentifiersField
-                    fieldPath="metadata.identifiers"
-                    label={i18next.t("Alternate identifier(s)")}
-                    labelIcon="barcode"
-                    schemeOptions={
-                      this.vocabularies.metadata.identifiers.scheme
-                    }
-                  />
-                </AccordionField>
-
-                <AccordionField
-                  fieldPath=""
-                  active={true}
-                  label={i18next.t("Related works")}
-                  ui={this.accordionStyle}
-                >
-                  <RelatedWorksField
-                    options={this.vocabularies.metadata.identifiers}
-                  />
-                  <br />
-                </AccordionField>
-              </Grid.Column>
-              <Ref innerRef={this.sidebarRef}>
-                <Grid.Column width={5} className="deposit-sidebar">
-                  <Sticky context={this.sidebarRef} offset={20}>
-                    <Card className="actions">
-                      <Card.Content>
-                        <div className="sidebar-buttons">
-                          <SaveButton fluid className="save-button" />
-                          <PreviewButton fluid className="preview-button" />
-                        </div>
-                        <PublishButton fluid />
-                      </Card.Content>
-                    </Card>
-
-                    <Card className="actions">
-                      <Card.Content>
-                        <DeleteButton
-                          fluid
-                          // TODO: make is_published part of the API response
-                          //       so we don't have to do this
-                          isPublished={this.props.record.is_published}
-                        />
-                      </Card.Content>
-                    </Card>
-
-                    <AccessRightField
-                      label={i18next.t("Visibility")}
-                      labelIcon={"shield"}
-                    />
-                  </Sticky>
-                </Grid.Column>
-              </Ref>
-            </Grid.Row>
-          </Grid>
-        </Container>
-      </DepositFormApp>
-    );
-  }
-}

invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/index.js

@@ -1,23 +0,0 @@
-// This file is part of InvenioRDM
-// Copyright (C) 2020 CERN.
-// Copyright (C) 2020 Northwestern University.
-//
-// Invenio App RDM is free software; you can redistribute it and/or modify it
-// under the terms of the MIT License; see LICENSE file for more details.
-
-import React from "react";
-import ReactDOM from "react-dom";
-import "semantic-ui-css/semantic.min.css";
-import { i18next } from "@translations/invenio_app_rdm/i18next";
-import { getInputFromDOM } from "react-invenio-deposit";
-import { RDMDepositForm } from "./RDMDepositForm";
-
-ReactDOM.render(
-  <RDMDepositForm
-    record={getInputFromDOM("deposits-record")}
-    files={getInputFromDOM("deposits-record-files")}
-    config={getInputFromDOM("deposits-config")}
-    permissions={getInputFromDOM("deposits-record-permissions")}
-  />,
-  document.getElementById("deposit-form")
-);

invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/theme.js

@@ -1,8 +1,12 @@
-import $ from 'jquery';
+import $ from "jquery";
-import 'semantic-ui-css';
+import "semantic-ui-css";
+import { MultipleOptionsSearchBar } from "@js/invenio_search_ui/components";
+import { i18next } from "@translations/invenio_app_rdm/i18next";
+import ReactDOM from "react-dom";
+import React from "react";
 
 // called on document ready
-$(function() {
+$(function () {
   importZammadScript();
 });
 
@@ -13,23 +17,21 @@ function importZammadScript() {
   document.head.appendChild(scriptNode);
 
   $.getScript("https://ub-support.tugraz.at/assets/form/form.js", () => {
-    $('#feedback-form').ZammadForm({
+    $("#feedback-form").ZammadForm({
-      messageTitle: 'Contact us',
+      messageTitle: "Contact us",
       showTitle: true,
-      messageSubmit: 'Submit',
+      messageSubmit: "Submit",
-      messageThankYou: 'Thank you for your message, (#%s). We will get back to you as quickly as possible!',
+      messageThankYou:
-      modal: true
+        "Thank you for your message, (#%s). We will get back to you as quickly as possible!",
+      modal: true,
     });
   });
 }
 
-
 // used for sticky test instance notification
-$('.ui.sticky.test-instance')
+$(".ui.sticky.test-instance").sticky({
-  .sticky({
+  context: "body",
-    context: 'body'
+});
-  })
-;
 
 export function toggleVisibility(id) {
   var element = document.getElementById(id);
@@ -39,3 +41,14 @@ export function toggleVisibility(id) {
 }
 
 window.toggleVisibility = toggleVisibility;
+
+const headerSearchbar = document.getElementById("header-search-bar");
+const searchBarOptions = JSON.parse(headerSearchbar.dataset.options);
+
+ReactDOM.render(
+  <MultipleOptionsSearchBar
+    options={searchBarOptions}
+    placeholder={i18next.t("Search records...")}
+  />,
+  headerSearchbar
+);

invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/communities.less

@@ -0,0 +1,14 @@
+/*
+ *   Copyright (C) 2022 Graz University of Technology.
+ *
+ * invenio-theme-tugraz  is free software; you can redistribute it and/or modify it
+ * under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+.ui.container.page-subheader-outer {
+  background-color: unset;
+}
+
+.ui.fluid.container {
+  width: fit-content;
+}

invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2020-2021 Graz University of Technology.
+ *   Copyright (C) 2020-2022 Graz University of Technology.
  *
  * invenio-theme-tugraz  is free software; you can redistribute it and/or modify it
  * under the terms of the MIT License; see LICENSE file for more details.
@@ -15,6 +15,7 @@
 @import "macros";
 @import "login";
 @import "deposit";
+@import "communities";
 
 /***
 **TODO:
@@ -32,3 +33,7 @@
   transition: background-color 0.15s ease 0s, color 0.15s ease 0s;
   outline: none;
 }
+
+.nowrap-link {
+  white-space: nowrap;
+}

invenio_theme_tugraz/config.py

@@ -16,9 +16,7 @@ INVENIO_THEME_TUGRAZ_DEFAULT_VALUE = _("TU Graz Repository")
 INVENIO_THEME_TUGRAZ_BASE_TEMPLATE = "invenio_theme_tugraz/base.html"
 """TU Graz Default base template"""
 
-INVENIO_THEME_TUGRAZ_ACCOUNT_BASE = (
+INVENIO_THEME_TUGRAZ_ACCOUNT_BASE = "invenio_theme_tugraz/accounts/accounts_base.html"
-    "invenio_theme_tugraz/accounts/accounts_base.html"
-)
 """TU Graz Default account base template"""
 
 INVENIO_THEME_TUGRAZ_ICON = "images/icon_use.png"
@@ -75,9 +73,7 @@ THEME_SITENAME = _("Repository")
 SECURITY_LOGIN_USER_TEMPLATE = "invenio_theme_tugraz/accounts/login_user.html"
 """Login template"""
 
-SECURITY_REGISTER_USER_TEMPLATE = (
+SECURITY_REGISTER_USER_TEMPLATE = "invenio_theme_tugraz/accounts/register_user.html"
-    "invenio_theme_tugraz/accounts/register_user.html"
-)
 """Sigup template"""
 
 # Invenio-app-rdm

invenio_theme_tugraz/deposits.py

@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2020-2022 Graz University of Technology.
-#
-# invenio-theme-tugraz is free software; you can redistribute it and/or
-# modify it under the terms of the MIT License; see LICENSE file for more
-# details.
-
-"""Routes for record-related pages provided by Invenio-App-RDM."""
-
-from flask import render_template
-from flask_login import login_required
-from invenio_app_rdm.records_ui.views.decorators import pass_draft, pass_draft_files
-from invenio_app_rdm.records_ui.views.deposits import (
-    get_form_config,
-    get_search_url,
-    new_record,
-)
-from invenio_rdm_records.resources.serializers import UIJSONSerializer
-
-
-@login_required
-def deposit_create():
-    """Create a new deposit."""
-    return render_template(
-        "invenio_theme_tugraz/records/deposit.html",
-        forms_config=get_form_config(createUrl=("/api/records")),
-        searchbar_config=dict(searchUrl=get_search_url()),
-        record=new_record(),
-        files=dict(
-            default_preview=None, entries=[], links={}
-        ),
-    )
-
-
-@login_required
-@pass_draft
-@pass_draft_files
-def deposit_edit(draft=None, draft_files=None, pid_value=None):
-    """Edit an existing deposit."""
-    record = UIJSONSerializer().serialize_object_to_dict(draft.to_dict())
-
-    return render_template(
-        "invenio_theme_tugraz/records/deposit.html",
-        forms_config=get_form_config(apiUrl=f"/api/records/{pid_value}/draft"),
-        record=record,
-        files=draft_files.to_dict(),
-        searchbar_config=dict(searchUrl=get_search_url()),
-        permissions=draft.has_permissions_to(['new_version'])
-    )

invenio_theme_tugraz/ext.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020-2022 Graz University of Technology.
+# Copyright (C) 2020-2021 Graz University of Technology.
 #
 # invenio-theme-tugraz is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -8,8 +8,6 @@
 
 """invenio module for TUGRAZ theme."""
 
-from invenio_theme_tugraz.deposits import deposit_create, deposit_edit
-
 from . import config
 from .views import index
 
@@ -27,8 +25,6 @@ class InvenioThemeTugraz(object):
         # add index route rule
         # https://flask.palletsprojects.com/en/1.1.x/api/#flask.Flask.add_url_rule
         app.add_url_rule("/", "index", index)
-        app.add_url_rule("/uploads/new", "deposit_create", deposit_create)
-        app.add_url_rule("/uploads/<pid_value>", "deposit_edit", deposit_edit)
         self.init_config(app)
         app.extensions["invenio-theme-tugraz"] = self
 

invenio_theme_tugraz/search.py

@@ -8,8 +8,6 @@
 
 """Frontpage records."""
 
-from __future__ import absolute_import, print_function
-
 from elasticsearch_dsl.query import Q
 from invenio_search.api import RecordsSearch
 
@@ -22,5 +20,6 @@ class FrontpageRecordsSearch(RecordsSearch):
 
         index = "rdmrecords-records"
         default_filter = Q(
-            "query_string", query=(
+            "query_string",
-                "access.record:public " "AND versions.is_latest:true"))
+            query=("access.record:public " "AND versions.is_latest:true"),
+        )

invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html

@@ -53,9 +53,9 @@
         {%- with form = login_user_form %}
         {%- set accordion_active = "active" if form.errors else "" %}
         <div class="ui styled accordion">
-          <div class="title {{ accordion_active }}">
+          <div class="title trigger {{ accordion_active }}">
             {{ _('Log in with repository credentials') }}
-            <i class="user icon"></i>
+            <i class="user icon button"></i>
           </div>
           <div class="content {{ accordion_active }}">
             <form action="{{ url_for_security('login') }}" method="POST" name="login_user_form" class="ui large form">

invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html

@@ -61,9 +61,9 @@
         {%- set accordion_active = "active" if form.errors else "" %}
         <div class="ui padded centered large form">
           <div class="ui styled accordion">
-            <div class="title {{ accordion_active }}">
+            <div class="title trigger {{ accordion_active }}">
               {{ _('Sign up with repository credentials') }}
-              <i class="user icon"></i>
+              <i class="user icon button"></i>
             </div>
             <div class="content {{ accordion_active }}">
               <form class="ui large form" action="{{ url_for_security('register') }}" method="POST" name="register_user_form">

invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html

@@ -13,7 +13,8 @@
 </div>
 {% endif %}
 
-<header>
+<div>
+  <header>
     {%- block navbar %}
     <nav>
       {%- block navbar_header %}
@@ -40,11 +41,20 @@
                 </span>
               </a>
             </div>
+
+
+
             {%- for item in current_menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
               <div class="two wide column main-menu-entry">
-              <a href="{{ item.url }}" class="no-decoration">{{ item.text|safe }}</a>
+                <a role="menuitem" href="{{ item.url }}" class="no-decoration">{{ item.text|safe }}</a>
               </div>
-            {%- endfor %}
+            {% endfor %}
+
+            {% for item in current_menu.submenu('actions').children|sort(attribute='order') if item.visible recursive %}
+              <div class="two wide column main-menu-entry">
+                <a role="menuitem" href="{{ item.url }}" class="no-decoration">{{ item.text|safe }}</a>
+              </div>
+            {% endfor %}
           </div>
 
           <div id="margin-divider" class="ui divider main-menu-underline-line">
@@ -62,9 +72,11 @@
       {%- from "invenio_theme/macros/messages.html" import flashed_messages with context -%}
       {{ flashed_messages() }}
     {%- endblock %}
-{#  
+  </header>
+
+  {#
   {%- block breadcrumbs %}
     {%- include "invenio_theme/breadcrumbs.html" %}
   {%- endblock breadcrumbs %}
-#}
+  #}
-</header>
+</div>

invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html

@@ -17,25 +17,8 @@
 {%- block page_body %}
 
 <div class="ui container">
-  {%- block frontpage_search %}
-
-  {%- block frontpage_form %}
-  <div class="ui center aligned grid">
-    <div class="sixteen wide column">
-      <form action="{{config.THEME_SEARCH_ENDPOINT}}" class="ui form" role="search">
-        <div class="ui fluid big action icon input">
-          <input type="text" name="q" autofocus="autofocus" placeholder="{{ _("Type and press enter to search") }}">
-          <button type="submit" class="ui icon search button">
-            <i class="icon search"></i>
-          </button>
-        </div>
-      </form>
-    </div>
-  </div>
   <div class="ui divider hidden"></div>
-  {%- endblock frontpage_form %}
 
-{%- endblock frontpage_search %}
   <div class="ui stackable grid">
 
     <!---Recent uploads-->

invenio_theme_tugraz/templates/invenio_theme_tugraz/navbar.html

@@ -1,18 +1,43 @@
 {#
-  Copyright (C) 2020-2021 Graz University of Technology.
+  Copyright (C) 2020-2022 Graz University of Technology.
 
   invenio-theme-tugraz is free software; you can redistribute it and/or
   modify it under the terms of the MIT License; see LICENSE file for more
   details.
 #}
 
+{% set options = [
+  {
+    "key": "records",
+    "text": _("All") + " " + config.THEME_SITENAME,
+    "value": url_for("invenio_search_ui.search"),
+    "title": "repo",
+  },{
+    "key": "marc21",
+    "text": _("search publications (thesis, books, papers, etc)"),
+    "value": url_for("invenio_records_marc21.search"),
+    "title": "publication",
+  },{
+    "key": "lom",
+    "text": _("search open educational resources"),
+    "value": url_for("invenio_records_lom.search"),
+    "title": "oer",
+  }
+]
+%}
+
 <div class="ui container">
   <div class="short-menu" id="all-menu-top-table">
     <div class="short-menu-left">
       <div id="all-menu-top-left-item">
         <div class="short-menu-left-search">
-          {%- if config.I18N_LANGUAGES %}
+          <div style="display: inline-block;">
-          <div class="short-menu-left-lang" style="margin-right:10px; font-size:18px;">
+            <div class="item p-0 search-bar rel-mr-1">
+              <div id="header-search-bar" data-options='{{ options | tojson }}'></div>
+            </div>
+          </div>
+
+          <div class="short-menu-left-lang">
             {%- for l in current_i18n.get_locales() %}
             {%- if current_i18n.language != l.language %}
             <a
@@ -20,21 +45,6 @@
             {%- endif %}
             {%- endfor %}
           </div>
-          {%- endif %}
-          <div class="search-icon-header">
-            <a href="{{url_for('invenio_search_ui.search')}}" class="no-decoration">
-              <svg class="short-menu-icon" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-                xmlns="http://www.w3.org/2000/svg" height="26.015" width="26.015" version="1.1"
-                xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
-                viewBox="0 0 26.01515 26.01515">
-                <g stroke-miterlimit="10" transform="translate(1,1)">
-                  <circle cy="8.5" cx="8.5" r="8" style="stroke-miterlimit:10;stroke-width:2"></circle>
-                  <path style="stroke-width:2;stroke-miterlimit:10;stroke-linecap:round" d="m14.156 14.156 9.344 9.344">
-                  </path>
-                </g>
-              </svg>
-            </a>
-          </div>
         </div>
       </div>
     </div>

invenio_theme_tugraz/templates/invenio_theme_tugraz/records/deposit.html

@@ -1,38 +0,0 @@
-{#
-  Copyright (C) 2020 CERN.
-  Copyright (C) 2020 Northwestern University.
-  Copyright (C) 2022 Graz University of Technology.
-
-  Invenio App RDM is free software; you can redistribute it and/or modify it
-  under the terms of the MIT License; see LICENSE file for more details.
-#}
-{%- if not record.is_published and record.versions.index and record.versions.index > 1%}
-  {%- set title = _("New version") %}
-{%- elif not record.is_published %}
-  {%- set title = _("New upload") %}
-{% else %}
-  {%- set title = _("Edit upload") %}
-{%- endif %}
-{%- extends config.BASE_TEMPLATE %}
-
-{%- block page_body %}
-  {%- if record %}
-  <input id="deposits-record" type="hidden" name="deposits-record" value='{{record | tojson }}'></input>
-  {%- endif %}
-  {%- if files %}
-  <input id="deposits-record-files" type="hidden" name="deposits-record-files" value='{{files | tojson }}'></input>
-  {%- endif %}
-  {%- if forms_config %}
-  <input type="hidden" name="deposits-config" value='{{forms_config | tojson }}'></input>
-  {%- endif %}
-  {%- if permissions %}
-  <input id="deposits-record-permissions" type="hidden" name="deposits-record-permissions" value='{{permissions | tojson }}'></input>
-  {%- endif %}
-  <div id="deposit-form"></div>
-{%- endblock page_body %}
-
-{%- block javascript %}
-    {{ super() }}
-    {{ webpack['invenio-theme-tugraz-rdm-deposit.js'] }}
-    
-{%- endblock %}

invenio_theme_tugraz/translations/de/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: invenio-theme-tugraz 1.0.4\n"
 "Report-Msgid-Bugs-To: mojib.wali@tugraz.at\n"
-"POT-Creation-Date: 2021-11-02 15:12+0100\n"
+"POT-Creation-Date: 2022-03-03 10:34+0100\n"
 "PO-Revision-Date: 2020-10-06 10:27+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
 #: invenio_theme_tugraz/config.py:13 invenio_theme_tugraz/config.py:62
 msgid "TU Graz Repository"
@@ -239,6 +239,10 @@ msgstr "Dies ist die Testumgebung des TU Graz Repositorys."
 msgid "Home"
 msgstr "Startseite"
 
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html:49
+msgid "My dashboard"
+msgstr "Meine Übersicht"
+
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:27
 msgid "Type and press enter to search"
 msgstr "Suchbegriff eingeben und “Enter” drücken (?)"
@@ -482,3 +486,6 @@ msgstr "Mit Ihren Repository Daten registrieren"
 #~ msgid "Reason"
 #~ msgstr "Grund"
 
+#~ msgid "Dashboard"
+#~ msgstr ""
+

invenio_theme_tugraz/translations/messages.pot

@@ -1,21 +1,22 @@
 # Translations template for invenio-theme-tugraz.
-# Copyright (C) 2021 Graz University of Technology
+# Copyright (C) 2022 Graz University of Technology
 # This file is distributed under the same license as the
 # invenio-theme-tugraz project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: invenio-theme-tugraz 3.6.1\n"
+"Project-Id-Version: invenio-theme-tugraz 3.7.0\n"
 "Report-Msgid-Bugs-To: mojib.wali@tugraz.at\n"
-"POT-Creation-Date: 2021-11-02 15:12+0100\n"
+"POT-Creation-Date: 2022-03-03 10:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
 #: invenio_theme_tugraz/config.py:13 invenio_theme_tugraz/config.py:62
 msgid "TU Graz Repository"
@@ -227,6 +228,10 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html:49
+msgid "My dashboard"
+msgstr ""
+
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:27
 msgid "Type and press enter to search"
 msgstr ""

invenio_theme_tugraz/version.py

@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2020-2021 Graz University of Technology.
-#
-# invenio-theme-tugraz is free software; you can redistribute it and/or
-# modify it under the terms of the MIT License; see LICENSE file for more
-# details.
-
-"""Version information for invenio-theme-tugraz.
-
-This file is imported by ``invenio_theme_tugraz.__init__``,
-and parsed by ``setup.py``.
-"""
-
-__version__ = "3.7.1.dev2"

invenio_theme_tugraz/views.py

@@ -8,8 +8,6 @@
 
 """invenio module for TUGRAZ theme."""
 
-import binascii
-from os import environ
 from typing import Dict
 
 from elasticsearch_dsl.utils import AttrDict
@@ -18,34 +16,36 @@ from invenio_rdm_records.resources.serializers import UIJSONSerializer
 
 from .search import FrontpageRecordsSearch
 
-
+blueprint = Blueprint(
-def ui_blueprint(app):
-    """Blueprint for the routes and resources provided by Invenio-theme-tugraz."""
-    routes = app.config.get("TUG_ROUTES")
-
-    blueprint = Blueprint(
     "invenio_theme_tugraz",
     __name__,
     template_folder="templates",
     static_folder="static",
-    )
+)
 
-    blueprint.add_url_rule(routes["index"], view_func=index)
-    blueprint.add_url_rule(routes["comingsoon"], view_func=comingsoon)
 
-    @blueprint.app_template_filter("make_dict_like")
+@blueprint.app_template_filter("make_dict_like")
-    def make_dict_like(value: str, key: str) -> Dict[str, str]:
+def make_dict_like(value: str, key: str) -> Dict[str, str]:
     """Convert the value to a dict like structure.
 
     in the form of a key -> value pair.
     """
     return {key: value}
 
-    @blueprint.app_template_filter("cast_to_dict")
+
-    def cast_to_dict(attr_dict):
+@blueprint.app_template_filter("cast_to_dict")
+def cast_to_dict(attr_dict):
     """Return the dict structure of AttrDict variable."""
     return AttrDict.to_dict(attr_dict)
 
+
+def ui_blueprint(app):
+    """Blueprint for the routes and resources provided by Invenio-theme-tugraz."""
+    routes = app.config.get("TUG_ROUTES")
+
+    blueprint.add_url_rule(routes["index"], view_func=index)
+    blueprint.add_url_rule(routes["comingsoon"], view_func=comingsoon)
+
     return blueprint
 
 
@@ -53,7 +53,7 @@ def records_serializer(records=None):
     """Serialize list of records."""
     record_list = []
     for record in records:
-        record_list.append(UIJSONSerializer().serialize_object_to_dict(record.to_dict()))
+        record_list.append(UIJSONSerializer().dump_obj(record.to_dict()))
     return record_list
 
 
@@ -62,8 +62,7 @@ def index():
     records = FrontpageRecordsSearch()[:5].sort("-created").execute()
 
     return render_template(
-        "invenio_theme_tugraz/index.html",
+        "invenio_theme_tugraz/index.html", records=records_serializer(records)
-        records=records_serializer(records)
     )
 
 

invenio_theme_tugraz/webpack.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2022 TUGRAZ.
+# Copyright (C) 2020 TUGRAZ.
 #
 # invenio-theme-tugraz  is free software.
 
@@ -17,7 +17,6 @@ theme = WebpackThemeBundle(
             entry={
                 "invenio-theme-tugraz-theme": "./less/invenio_theme_tugraz/theme.less",
                 "invenio-theme-tugraz-js": "./js/invenio_theme_tugraz/theme.js",
-                "invenio-theme-tugraz-rdm-deposit": "./js/invenio_theme_tugraz/deposit/index.js",
             },
             dependencies={
                 # add any additional npm dependencies here...

pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel", "babel>2.8"]
+build-backend = "setuptools.build_meta"

pytest.ini

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2020-2021 Graz University of Technology.
-#
-# invenio-theme-tugraz is free software; you can redistribute it and/or
-# modify it under the terms of the MIT License; see LICENSE file for more
-# details.
-
-[pytest]
-addopts = --isort --pydocstyle --pycodestyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_theme_tugraz --cov-report=term-missing tests invenio_theme_tugraz
-testpaths = tests invenio_theme_tugraz
-live_server_scope = module

run-tests.sh

@@ -16,17 +16,8 @@ set -o errexit
 # Quit on unbound symbols
 set -o nounset
 
-# Always bring down docker services
-
-function cleanup() {
-    eval "$(docker-services-cli down --env)"
-}
-trap cleanup EXIT
-
-
 python -m check_manifest --ignore ".*-requirements.txt"
 python -m sphinx.cmd.build -qnN docs docs/_build/html
-eval "$(docker-services-cli up --db ${DB:-postgresql} --search ${SEARCH:-elasticsearch} --cache ${CACHE:-redis} --env)"
 python -m pytest
 tests_exit_code=$?
 python -m sphinx.cmd.build -qnN -b doctest docs docs/_build/doctest

setup.cfg

@@ -6,6 +6,63 @@
 # modify it under the terms of the MIT License; see LICENSE file for more
 # details.
 
+[metadata]
+name = invenio-theme-tugraz
+version = attr: invenio_theme_tugraz.__version__
+description = "Invenio module for TUGRAZ theme."
+long_description = file: README.rst, CHANGES.rst
+keywords = invenio theme invenioRDM TU-Graz
+license = MIT
+author = "Graz University of Technology"
+author_email = mojib.wali@tugraz.at
+url = https://github.com/tu-graz-library/invenio-theme-tugraz
+platforms = any
+classifiers =
+    Environment :: Web Environment
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Topic :: Internet :: WWW/HTTP :: Dynamic Content
+    Topic :: Software Development :: Libraries :: Python Modules
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Development Status :: 3 - Alpha
+
+[options]
+include_package_data = True
+packages = find:
+python_requires = >=3.8
+zip_safe = False
+install_requires =
+    Flask-BabelEx>=0.9.4
+    Flask-WebpackExt>=1.0.0
+    invenio-assets>=1.2.7,<1.3.0
+    invenio-i18n>=1.3.1,<1.4.0
+    invenio_config_tugraz>=0.9.0,<0.10.0
+
+[options.extras_require]
+tests =
+    pytest-black>=0.3.0,<0.3.10
+    sphinx>=4.2.0,<5
+    pytest-invenio>=1.4.7
+    invenio-app>=1.3.0,<2.0.0
+elasticsearch7 =
+    invenio-search[elasticsearch7]>=1.4.2,<2.0
+
+[options.entry_points]
+invenio_base.apps =
+    invenio_theme_tugraz = invenio_theme_tugraz:InvenioThemeTugraz
+invenio_base.blueprints =
+    invenio_theme_tugraz = invenio_theme_tugraz.views:ui_blueprint
+invenio_i18n.translations =
+    messages = invenio_theme_tugraz
+invenio_assets.webpack =
+    invenio_theme_tugraz_theme = invenio_theme_tugraz.webpack:theme
+invenio_config.module =
+    invenio_theme_tugraz = invenio_theme_tugraz.config
+
 [aliases]
 test = pytest
 
@@ -22,6 +79,7 @@ add_ignore = D401
 
 [compile_catalog]
 directory = invenio_theme_tugraz/translations/
+use-fuzzy = True
 
 [extract_messages]
 copyright_holder = Graz University of Technology
@@ -37,20 +95,10 @@ output-dir = invenio_theme_tugraz/translations/
 [update_catalog]
 input-file = invenio_theme_tugraz/translations/messages.pot
 output-dir = invenio_theme_tugraz/translations/
-
-[flake8]
-max-line-length = 88
-extend-ignore = E203
-select = C,E,F,W,B,B950
-ignore = E501
-
 [isort]
-multi_line_output = 3
+profile=black
-include_trailing_comma = True
-force_grid_wrap = 0
-use_parentheses = True
-ensure_newline_before_comments = True
-line_length = 88
 
-[pycodestyle]
+[tool:pytest]
-ignore = E203,E501
+addopts = --black --isort --pydocstyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_theme_tugraz --cov-report=term-missing tests invenio_theme_tugraz
+testpaths = tests invenio_theme_tugraz
+live_server_scope = module

setup.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020-2021 Graz University of Technology.
+# Copyright (C) 2020-2022 Graz University of Technology.
 #
 # invenio-theme-tugraz is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -8,114 +8,6 @@
 
 """invenio module for TUGRAZ theme."""
 
-import os
+from setuptools import setup
 
-from setuptools import find_packages, setup
+setup()
-
-readme = open("README.rst").read()
-history = open("CHANGES.rst").read()
-
-tests_require = [
-    "pytest-invenio>=1.4.0",
-    "invenio-app>=1.3.0,<2.0.0",
-    "invenio-app-rdm>=7.0.1,<8.0.0",
-]
-
-# Should follow invenio-app-rdm
-invenio_search_version = ">=1.4.0,<1.5.0"
-invenio_db_version = ">=1.0.9,<1.1.0"
-
-extras_require = {
-    "elasticsearch7": [f"invenio-search[elasticsearch7]{invenio_search_version}"],
-    "mysql": [f"invenio-db[mysql,versioning]{invenio_db_version}"],
-    "postgresql": [f"invenio-db[postgresql,versioning]{invenio_db_version}"],
-    "sqlite": [f"invenio-db[versioning]{invenio_db_version}"],
-    "docs": [
-        "Sphinx==4.2.0",
-    ],
-    "tests": tests_require,
-}
-
-extras_require["all"] = []
-for name, reqs in extras_require.items():
-    if name[0] == ":" or name in (
-        "elasticsearch7",
-        "mysql",
-        "postgresql",
-        "sqlite",
-    ):
-        continue
-    extras_require["all"].extend(reqs)
-
-setup_requires = [
-    "Babel>=1.3",
-    "pytest-runner>=3.0.0,<5",
-]
-
-install_requires = [
-    "Flask-BabelEx>=0.9.4",
-    "Flask-WebpackExt>=1.0.0",
-    "invenio-assets>=1.2.0",
-    "invenio-i18n>=1.2.0",
-    "invenio_config_tugraz>=0.7.0,<0.8.0",
-]
-
-packages = find_packages()
-
-
-# Get the version string. Cannot be done with import!
-g = {}
-with open(os.path.join("invenio_theme_tugraz", "version.py"), "rt") as fp:
-    exec(fp.read(), g)
-    version = g["__version__"]
-
-setup(
-    name="invenio-theme-tugraz",
-    version=version,
-    description=__doc__,
-    long_description=readme + "\n\n" + history,
-    keywords="invenio, theme, invenioRDM, TU-Graz, Graz University of Technology, statistics",
-    license="MIT",
-    author="Graz University of Technology",
-    author_email="mojib.wali@tugraz.at",
-    url="https://github.com/tu-graz-library/invenio-theme-tugraz",
-    packages=packages,
-    zip_safe=False,
-    include_package_data=True,
-    platforms="any",
-    entry_points={
-        "invenio_base.apps": [
-            "invenio_theme_tugraz = invenio_theme_tugraz:InvenioThemeTugraz",
-        ],
-        "invenio_base.blueprints": [
-            "invenio_theme_tugraz = invenio_theme_tugraz.views:ui_blueprint",
-        ],
-        "invenio_i18n.translations": [
-            "messages = invenio_theme_tugraz",
-        ],
-        "invenio_assets.webpack": [
-            "invenio_theme_tugraz_theme = invenio_theme_tugraz.webpack:theme",
-        ],
-        "invenio_config.module": [
-            "invenio_theme_tugraz = invenio_theme_tugraz.config",
-        ],
-    },
-    extras_require=extras_require,
-    install_requires=install_requires,
-    setup_requires=setup_requires,
-    tests_require=tests_require,
-    classifiers=[
-        "Environment :: Web Environment",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Development Status :: 3 - Alpha",
-    ],
-)

tests/conftest.py

@@ -12,62 +12,21 @@ See https://pytest-invenio.readthedocs.io/ for documentation on which test
 fixtures are available.
 """
 
-import os
-import shutil
-import tempfile
-
 import pytest
 from flask import Flask
-from flask_babelex import Babel
-from invenio_db import InvenioDB, db
 from invenio_i18n import InvenioI18N
-from invenio_search import InvenioSearch
-from sqlalchemy_utils.functions import create_database, database_exists, drop_database
 
 from invenio_theme_tugraz import InvenioThemeTugraz
 
 
-@pytest.fixture(scope="module")
-def celery_config():
-    """Override pytest-invenio fixture.
-
-    TODO: Remove this fixture if you add Celery support.
-    """
-    return {}
-
-
 @pytest.fixture()
 def app(request):
     """Basic Flask application."""
-    instance_path = tempfile.mkdtemp()
     app = Flask("testapp")
-    DB = os.getenv("SQLALCHEMY_DATABASE_URI", "sqlite://")
     app.config.update(
         I18N_LANGUAGES=[("en", "English"), ("de", "German")],
-        SQLALCHEMY_DATABASE_URI=DB,
-        SQLALCHEMY_TRACK_MODIFICATIONS=False,
     )
-    Babel(app)
-    InvenioDB(app)
-    InvenioSearch(app)
     InvenioThemeTugraz(app)
     InvenioI18N(app)
 
-    with app.app_context():
-        db_url = str(db.engine.url)
-        if db_url != "sqlite://" and not database_exists(db_url):
-            create_database(db_url)
-        db.create_all()
-
-    def teardown():
-        with app.app_context():
-            db_url = str(db.engine.url)
-            db.session.close()
-            if db_url != "sqlite://":
-                drop_database(db_url)
-            shutil.rmtree(instance_path)
-
-    request.addfinalizer(teardown)
-    app.test_request_context().push()
-
     return app

tests/test_invenio_theme_tugraz.py

@@ -35,4 +35,4 @@ def test_init():
 
 def test_app(app):
     """Test extension initialization."""
-    theme = InvenioThemeTugraz(app)
+    _ = InvenioThemeTugraz(app)

tests/ui/conftest.py

@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2020-2021 Graz University of Technology.
-#
-# invenio-theme-tugraz is free software; you can redistribute it and/or
-# modify it under the terms of the MIT License; see LICENSE file for more
-# details.
-
-"""Pytest configuration.
-
-See https://pytest-invenio.readthedocs.io/ for documentation on which test
-fixtures are available.
-"""
-
-import pytest
-from invenio_app.factory import create_ui
-
-
-@pytest.fixture(scope='module')
-def create_app(instance_path):
-    """Application factory fixture."""
-    return create_ui

tests/ui/test_views.py

@@ -1,33 +0,0 @@
-# # -*- coding: utf-8 -*-
-# #
-# # Copyright (C) 2020-2021 Graz University of Technology.
-# #
-# # invenio-theme-tugraz is free software; you can redistribute it and/or
-# # modify it under the terms of the MIT License; see LICENSE file for more
-# # details.
-
-# """Test views."""
-
-# from elasticsearch_dsl.utils import AttrDict
-
-# from invenio_theme_tugraz.views import cast_to_dict, make_dict_like
-
-
-# def test_make_dict_like():
-#     """Test make_dict_like."""
-#     access = {
-#         "access_right" : "open"
-#     }
-#     dicts = make_dict_like("open", "access_right")
-#     assert access == dicts
-
-
-# def test_cast_to_dict():
-#     """Test cast_to_dict."""
-#     resource_type = {
-#         "subtype" : "publication-datamanagementplan",
-#         "type" : "publication"
-#     }
-#     expected = {'subtype': 'publication-datamanagementplan', 'type': 'publication'}
-#     attr = cast_to_dict(AttrDict(resource_type))
-#     assert expected == attr