From 69fc698866802d2e666beb59be2dcac75314022a Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 15 Jul 2020 12:33:10 +0300 Subject: [PATCH 01/10] Unified datasets and datasetWizard Controllers --- .../controllers/DatasetWizardController.java | 224 ----------------- .../java/eu/eudat/controllers/Datasets.java | 230 +++++++++++++++++- .../dataset-wizard/dataset-wizard.service.ts | 4 +- .../dataset-external-autocomplete.service.ts | 2 +- 4 files changed, 220 insertions(+), 240 deletions(-) delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java deleted file mode 100644 index c2b9abc43..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java +++ /dev/null @@ -1,224 +0,0 @@ -package eu.eudat.controllers; - -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.query.items.item.dataset.DatasetWizardAutocompleteRequest; -import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileWizardAutocompleteRequest; -import eu.eudat.exceptions.datasetwizard.DatasetWizardCannotUnlockException; -import eu.eudat.exceptions.security.UnauthorisedException; -import eu.eudat.logic.managers.DatasetManager; -import eu.eudat.logic.managers.DatasetWizardManager; -import eu.eudat.logic.managers.UserManager; -import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; -import eu.eudat.logic.security.claims.ClaimedAuthorities; -import eu.eudat.logic.services.ApiContext; -import eu.eudat.logic.services.forms.VisibilityRuleService; -import eu.eudat.logic.utilities.documents.helpers.FileEnvelope; -import eu.eudat.models.data.datasetwizard.DataManagentPlanListingModel; -import eu.eudat.models.data.datasetwizard.DatasetWizardModel; -import eu.eudat.models.data.dmp.AssociatedProfile; -import eu.eudat.models.data.helpers.responses.ResponseItem; -import eu.eudat.models.data.listingmodels.DataManagementPlanOverviewModel; -import eu.eudat.models.data.security.Principal; -import eu.eudat.models.data.user.composite.PagedDatasetProfile; -import eu.eudat.types.ApiMessageCode; -import eu.eudat.types.Authorities; -import org.apache.poi.util.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.persistence.NoResultException; -import javax.transaction.Transactional; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.util.List; -import java.util.UUID; - -import static eu.eudat.types.Authorities.ANONYMOUS; - - -@RestController -@CrossOrigin -@RequestMapping(value = {"api/datasetwizard"}) -public class DatasetWizardController extends BaseController { - private static final Logger logger = LoggerFactory.getLogger(DatasetWizardController.class); - - private Environment environment; - private DatasetManager datasetManager; - private UserManager userManager; - private ConfigLoader configLoader; - - @Autowired - public DatasetWizardController(ApiContext apiContext, Environment environment, DatasetManager datasetManager, UserManager userManager, ConfigLoader configLoader) { - super(apiContext); - this.environment = environment; - this.datasetManager = datasetManager; - this.userManager = userManager; - this.configLoader = configLoader; - } - - @RequestMapping(method = RequestMethod.POST, value = {"/userDmps"}, produces = "application/json") - public @ResponseBody - ResponseEntity>> getUserDmps(@RequestBody DatasetWizardAutocompleteRequest datasetWizardAutocompleteRequest, Principal principal) throws IllegalAccessException, InstantiationException { - List dataManagementPlans = DatasetWizardManager.getUserDmps(this.getApiContext().getOperationsContext().getDatabaseRepository().getDmpDao(), datasetWizardAutocompleteRequest, principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlans)); - } - - @RequestMapping(method = RequestMethod.POST, value = {"/getAvailableProfiles"}, produces = "application/json") - public @ResponseBody - ResponseEntity>> getAvailableProfiles(@RequestBody DatasetProfileWizardAutocompleteRequest datasetProfileWizardAutocompleteRequest, @ClaimedAuthorities(claims = {ANONYMOUS}) Principal principal) throws IllegalAccessException, InstantiationException { - List dataManagementPlans = DatasetWizardManager.getAvailableProfiles(this.getApiContext().getOperationsContext().getDatabaseRepository().getDmpDao(), datasetProfileWizardAutocompleteRequest); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlans)); - } - - @Transactional - @RequestMapping(method = RequestMethod.GET, value = {"{id}"}, produces = "application/json") - public @ResponseBody - ResponseEntity getSingle(@PathVariable String id, @RequestHeader("Content-Type") String contentType, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException { - try { - if (contentType.equals("application/xml")) { - VisibilityRuleService visibilityRuleService = this.getApiContext().getUtilitiesService().getVisibilityRuleService(); - return this.datasetManager.getDocument(id, visibilityRuleService, contentType, principal); - } else if (contentType.equals("application/msword")) { - FileEnvelope file = datasetManager.getWordDocumentFile(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService(), principal); - InputStream resource = new FileInputStream(file.getFile()); - HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.setContentLength(file.getFile().length()); - responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM); - responseHeaders.set("Content-Disposition", "attachment;filename=" + file.getFilename()); - responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition"); - responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type"); - - byte[] content = IOUtils.toByteArray(resource); - resource.close(); - Files.deleteIfExists(file.getFile().toPath()); - return new ResponseEntity<>(content, - responseHeaders, - HttpStatus.OK); - } else { - DatasetWizardModel dataset = this.datasetManager.getSingle(id, principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(dataset)); - } - } catch (Exception e) { - if (e instanceof UnauthorisedException) { - if (e instanceof UnauthorisedException) { - return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE)); - } else if (e instanceof NoResultException) { - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE)); - } else { - throw e; - } - } - } - return null; // ???? - } - - @RequestMapping(method = RequestMethod.GET, value = {"/public/{id}"}, produces = "application/json") - public @ResponseBody - ResponseEntity getSinglePublic(@PathVariable String id) throws Exception { - try { - DatasetWizardModel dataset = this.datasetManager.getSinglePublic(id); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(dataset)); - } - catch (Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).message(ex.getMessage())); - } - } - - @Transactional - @RequestMapping(method = RequestMethod.DELETE, value = {"{id}"}, produces = "application/json") - public @ResponseBody - ResponseEntity> delete(@PathVariable(value = "id") UUID id, Principal principal) throws Exception { - new DatasetWizardManager().delete(this.getApiContext(), id); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Deleted")); - } - - @Transactional - @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json") - public @ResponseBody - ResponseEntity> createOrUpdate(@RequestBody DatasetWizardModel profile, Principal principal) throws Exception { - this.datasetManager.createOrUpdate(profile, principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created").payload(null)); - } - - @RequestMapping(method = RequestMethod.GET, value = {"/getPDF/{id}"}) - public @ResponseBody - ResponseEntity getPDFDocument(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException, InterruptedException { - FileEnvelope file = datasetManager.getWordDocumentFile(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService(), principal); - String fileName = file.getFilename(); - if (fileName.endsWith(".docx")){ - fileName = fileName.substring(0, fileName.length() - 5); - } - File pdffile = datasetManager.convertToPDF(file, environment); - InputStream resource = new FileInputStream(pdffile); - - HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.setContentLength(pdffile.length()); - responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM); - responseHeaders.set("Content-Disposition", "attachment;filename=" + fileName + ".pdf"); - responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition"); - responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type"); - - byte[] content = IOUtils.toByteArray(resource); - resource.close(); - Files.deleteIfExists(file.getFile().toPath()); - Files.deleteIfExists(pdffile.toPath()); - return new ResponseEntity<>(content, - responseHeaders, - HttpStatus.OK); - } - - @RequestMapping(method = RequestMethod.GET, value = {"/get/{id}"}, produces = "application/json") - public ResponseEntity> getSingle(@PathVariable String id) { - eu.eudat.data.entities.DatasetProfile profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id)); - eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(profile); - PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile(); - pagedDatasetProfile.buildPagedDatasetProfile(datasetprofile); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(pagedDatasetProfile)); - } - - @Transactional - @RequestMapping(method = RequestMethod.GET, value = {"/{id}/unlock"}, produces = "application/json") - public @ResponseBody - ResponseEntity> unlock(@PathVariable(value = "id") UUID id, Principal principal) throws Exception { - try { - new DatasetWizardManager().unlock(this.getApiContext(), id); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Unlocked")); - } catch (DatasetWizardCannotUnlockException datasetWizardCannotUnlockException) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(datasetWizardCannotUnlockException.getMessage())); - } - } - - @RequestMapping(method = RequestMethod.POST, value = {"/upload"}) - public ResponseEntity datasetXmlImport(@RequestParam("file") MultipartFile file, @RequestParam("dmpId") String dmpId, @RequestParam("datasetProfileId") String datasetProfileId, Principal principal) { - try { - Dataset dataset = this.datasetManager.createDatasetFromXml(file, dmpId, datasetProfileId, principal); - if (dataset != null){ - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); - } - else { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).message("Import was unsuccessful.")); - } - } catch (Exception e) { - logger.error(e.getMessage(), e); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).message("Import was unsuccessful.")); - } - } - - @RequestMapping(method = RequestMethod.GET, value = {"profile/{id}"}, produces = "application/json") - public @ResponseBody - ResponseEntity getSingleProfileUpdate(@PathVariable String id, @ClaimedAuthorities(claims = {ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException { - DatasetWizardModel dataset = this.datasetManager.datasetUpdateProfile(id); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(dataset)); - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java index 781237cab..00a7431b9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java @@ -1,45 +1,84 @@ package eu.eudat.controllers; import eu.eudat.data.entities.Dataset; +import eu.eudat.data.query.items.item.dataset.DatasetWizardAutocompleteRequest; +import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileWizardAutocompleteRequest; import eu.eudat.data.query.items.table.dataset.DatasetPublicTableRequest; import eu.eudat.data.query.items.table.dataset.DatasetTableRequest; import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; +import eu.eudat.exceptions.datasetwizard.DatasetWizardCannotUnlockException; import eu.eudat.exceptions.security.UnauthorisedException; import eu.eudat.logic.managers.DatasetManager; import eu.eudat.logic.managers.DatasetWizardManager; +import eu.eudat.logic.managers.UserManager; +import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.security.claims.ClaimedAuthorities; import eu.eudat.logic.services.ApiContext; +import eu.eudat.logic.services.forms.VisibilityRuleService; +import eu.eudat.logic.utilities.documents.helpers.FileEnvelope; import eu.eudat.models.data.dataset.DatasetOverviewModel; import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel; +import eu.eudat.models.data.datasetwizard.DataManagentPlanListingModel; +import eu.eudat.models.data.datasetwizard.DatasetWizardModel; +import eu.eudat.models.data.dmp.AssociatedProfile; import eu.eudat.models.data.helpers.common.DataTableData; import eu.eudat.models.data.helpers.responses.ResponseItem; +import eu.eudat.models.data.listingmodels.DataManagementPlanOverviewModel; import eu.eudat.models.data.listingmodels.DatasetListingModel; import eu.eudat.models.data.security.Principal; +import eu.eudat.models.data.user.composite.PagedDatasetProfile; import eu.eudat.types.ApiMessageCode; import eu.eudat.types.Authorities; +import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.persistence.NoResultException; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.util.List; import java.util.Locale; import java.util.UUID; +import static eu.eudat.types.Authorities.ANONYMOUS; + @RestController @CrossOrigin @RequestMapping(value = {"/api/datasets/"}) public class Datasets extends BaseController { + private static final Logger logger = LoggerFactory.getLogger(Datasets.class); + private Environment environment; private DatasetManager datasetManager; + private ConfigLoader configLoader; + private UserManager userManager; @Autowired - public Datasets(ApiContext apiContext, DatasetManager datasetManager) { + public Datasets(ApiContext apiContext, Environment environment, DatasetManager datasetManager, ConfigLoader configLoader, UserManager userManager) { super(apiContext); + this.environment = environment; this.datasetManager = datasetManager; + this.configLoader = configLoader; + this.userManager = userManager; } + /* + * Data Retrieval + * */ + @RequestMapping(method = RequestMethod.POST, value = {"paged"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity>> getPaged(@RequestBody DatasetTableRequest datasetTableRequest, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception { @@ -81,12 +120,46 @@ public class Datasets extends BaseController { // } } - @Transactional - @RequestMapping(method = RequestMethod.GET, value = {"/makepublic/{id}"}, produces = "application/json") + @javax.transaction.Transactional + @RequestMapping(method = RequestMethod.GET, value = {"{id}"}, produces = "application/json") public @ResponseBody - ResponseEntity> makePublic(@PathVariable UUID id, Principal principal, Locale locale) throws Exception { - this.datasetManager.makePublic(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), id); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message(this.getApiContext().getHelpersService().getMessageSource().getMessage("dataset.public", new Object[]{}, locale))); + ResponseEntity getSingle(@PathVariable String id, @RequestHeader("Content-Type") String contentType, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException { + try { + if (contentType.equals("application/xml")) { + VisibilityRuleService visibilityRuleService = this.getApiContext().getUtilitiesService().getVisibilityRuleService(); + return this.datasetManager.getDocument(id, visibilityRuleService, contentType, principal); + } else if (contentType.equals("application/msword")) { + FileEnvelope file = datasetManager.getWordDocumentFile(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService(), principal); + InputStream resource = new FileInputStream(file.getFile()); + HttpHeaders responseHeaders = new HttpHeaders(); + responseHeaders.setContentLength(file.getFile().length()); + responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM); + responseHeaders.set("Content-Disposition", "attachment;filename=" + file.getFilename()); + responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition"); + responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type"); + + byte[] content = IOUtils.toByteArray(resource); + resource.close(); + Files.deleteIfExists(file.getFile().toPath()); + return new ResponseEntity<>(content, + responseHeaders, + HttpStatus.OK); + } else { + DatasetWizardModel dataset = this.datasetManager.getSingle(id, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(dataset)); + } + } catch (Exception e) { + if (e instanceof UnauthorisedException) { + if (e instanceof UnauthorisedException) { + return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE)); + } else if (e instanceof NoResultException) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE)); + } else { + throw e; + } + } + } + return null; // ???? } @RequestMapping(method = RequestMethod.POST, value = {"/datasetProfilesUsedByDatasets/paged"}, produces = "application/json") @@ -96,6 +169,143 @@ public class Datasets extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData)); } + @RequestMapping(method = RequestMethod.POST, value = {"/userDmps"}, produces = "application/json") + public @ResponseBody + ResponseEntity>> getUserDmps(@RequestBody DatasetWizardAutocompleteRequest datasetWizardAutocompleteRequest, Principal principal) throws IllegalAccessException, InstantiationException { + List dataManagementPlans = DatasetWizardManager.getUserDmps(this.getApiContext().getOperationsContext().getDatabaseRepository().getDmpDao(), datasetWizardAutocompleteRequest, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlans)); + } + + @RequestMapping(method = RequestMethod.POST, value = {"/getAvailableProfiles"}, produces = "application/json") + public @ResponseBody + ResponseEntity>> getAvailableProfiles(@RequestBody DatasetProfileWizardAutocompleteRequest datasetProfileWizardAutocompleteRequest, @ClaimedAuthorities(claims = {ANONYMOUS}) Principal principal) throws IllegalAccessException, InstantiationException { + List dataManagementPlans = DatasetWizardManager.getAvailableProfiles(this.getApiContext().getOperationsContext().getDatabaseRepository().getDmpDao(), datasetProfileWizardAutocompleteRequest); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlans)); + } + + @RequestMapping(method = RequestMethod.GET, value = {"/public/{id}"}, produces = "application/json") + public @ResponseBody + ResponseEntity getSinglePublic(@PathVariable String id) throws Exception { + try { + DatasetWizardModel dataset = this.datasetManager.getSinglePublic(id); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(dataset)); + } + catch (Exception ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).message(ex.getMessage())); + } + } + + @RequestMapping(method = RequestMethod.GET, value = {"/get/{id}"}, produces = "application/json") + public ResponseEntity> getSingle(@PathVariable String id) { + eu.eudat.data.entities.DatasetProfile profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id)); + eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(profile); + PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile(); + pagedDatasetProfile.buildPagedDatasetProfile(datasetprofile); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(pagedDatasetProfile)); + } + + @RequestMapping(method = RequestMethod.GET, value = {"profile/{id}"}, produces = "application/json") + public @ResponseBody + ResponseEntity getSingleProfileUpdate(@PathVariable String id, @ClaimedAuthorities(claims = {ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException { + DatasetWizardModel dataset = this.datasetManager.datasetUpdateProfile(id); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(dataset)); + } + + /* + * Data Export + * */ + + @RequestMapping(method = RequestMethod.GET, value = {"/getPDF/{id}"}) + public @ResponseBody + ResponseEntity getPDFDocument(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws IllegalAccessException, IOException, InstantiationException, InterruptedException { + FileEnvelope file = datasetManager.getWordDocumentFile(this.configLoader, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService(), principal); + String fileName = file.getFilename(); + if (fileName.endsWith(".docx")){ + fileName = fileName.substring(0, fileName.length() - 5); + } + File pdffile = datasetManager.convertToPDF(file, environment); + InputStream resource = new FileInputStream(pdffile); + + HttpHeaders responseHeaders = new HttpHeaders(); + responseHeaders.setContentLength(pdffile.length()); + responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM); + responseHeaders.set("Content-Disposition", "attachment;filename=" + fileName + ".pdf"); + responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition"); + responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type"); + + byte[] content = IOUtils.toByteArray(resource); + resource.close(); + Files.deleteIfExists(file.getFile().toPath()); + Files.deleteIfExists(pdffile.toPath()); + return new ResponseEntity<>(content, + responseHeaders, + HttpStatus.OK); + } + + /* + * Data Management + * */ + + @javax.transaction.Transactional + @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json") + public @ResponseBody + ResponseEntity> createOrUpdate(@RequestBody DatasetWizardModel profile, Principal principal) throws Exception { + this.datasetManager.createOrUpdate(profile, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created").payload(null)); + } + + @Transactional + @RequestMapping(method = RequestMethod.GET, value = {"/makepublic/{id}"}, produces = "application/json") + public @ResponseBody + ResponseEntity> makePublic(@PathVariable UUID id, Principal principal, Locale locale) throws Exception { + this.datasetManager.makePublic(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), id); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message(this.getApiContext().getHelpersService().getMessageSource().getMessage("dataset.public", new Object[]{}, locale))); + } + + @javax.transaction.Transactional + @RequestMapping(method = RequestMethod.DELETE, value = {"/delete/{id}"}, produces = "application/json") + public @ResponseBody + ResponseEntity> delete(@PathVariable(value = "id") UUID id, Principal principal) throws Exception { + new DatasetWizardManager().delete(this.getApiContext(), id); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Deleted")); + } + + @javax.transaction.Transactional + @RequestMapping(method = RequestMethod.GET, value = {"/{id}/unlock"}, produces = "application/json") + public @ResponseBody + ResponseEntity> unlock(@PathVariable(value = "id") UUID id, Principal principal) throws Exception { + try { + new DatasetWizardManager().unlock(this.getApiContext(), id); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Unlocked")); + } catch (DatasetWizardCannotUnlockException datasetWizardCannotUnlockException) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(datasetWizardCannotUnlockException.getMessage())); + } + } + + /* + * Data Import + * */ + + @RequestMapping(method = RequestMethod.POST, value = {"/upload"}) + public ResponseEntity datasetXmlImport(@RequestParam("file") MultipartFile file, @RequestParam("dmpId") String dmpId, @RequestParam("datasetProfileId") String datasetProfileId, Principal principal) { + try { + Dataset dataset = this.datasetManager.createDatasetFromXml(file, dmpId, datasetProfileId, principal); + if (dataset != null){ + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); + } + else { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).message("Import was unsuccessful.")); + } + } catch (Exception e) { + logger.error(e.getMessage(), e); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).message("Import was unsuccessful.")); + } + } + + /* + * Data Index + * */ + @javax.transaction.Transactional @RequestMapping(method = RequestMethod.POST, value = {"/index"}) public @ResponseBody @@ -112,12 +322,6 @@ public class Datasets extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Cleared").payload(null)); } - @javax.transaction.Transactional - @RequestMapping(method = RequestMethod.DELETE, value = {"/delete/{id}"}, produces = "application/json") - public @ResponseBody - ResponseEntity> delete(@PathVariable(value = "id") UUID id, Principal principal) throws Exception { - new DatasetWizardManager().delete(this.getApiContext(), id); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Deleted")); - } + } diff --git a/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts b/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts index 3f1b65a33..4db5fc2ee 100644 --- a/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts +++ b/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts @@ -19,7 +19,7 @@ export class DatasetWizardService { private headers = new HttpHeaders(); constructor(private http: BaseHttpService, private httpClient: HttpClient, private configurationService: ConfigurationService) { - this.actionUrl = configurationService.server + 'datasetwizard/'; + this.actionUrl = configurationService.server + 'datasets/'; } // public userDmps(criteria: RequestItem): Observable { @@ -39,7 +39,7 @@ export class DatasetWizardService { } public delete(id: string): Observable { - return this.http.delete(this.actionUrl + id, { headers: this.headers }); + return this.http.delete(this.actionUrl + 'delete/' + id, { headers: this.headers }); } createDataset(datasetModel: DatasetWizardModel): Observable { diff --git a/dmp-frontend/src/app/core/services/dataset/dataset-external-autocomplete.service.ts b/dmp-frontend/src/app/core/services/dataset/dataset-external-autocomplete.service.ts index 21d3f814a..35ee12a6f 100644 --- a/dmp-frontend/src/app/core/services/dataset/dataset-external-autocomplete.service.ts +++ b/dmp-frontend/src/app/core/services/dataset/dataset-external-autocomplete.service.ts @@ -16,7 +16,7 @@ export class DatasetExternalAutocompleteService { private httpClient: HttpClient, private datasetProfileService: DatasetProfileService, private configurationService: ConfigurationService) { - this.actionUrl = configurationService.server + 'datasetwizard/'; + this.actionUrl = configurationService.server + 'datasets/'; } getDatasetProfileById(datasetProfileID) { From d40e9fadbfd66f06af867f036fb763ae0f024725 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 15 Jul 2020 12:35:22 +0300 Subject: [PATCH 02/10] Removed RDA JSON export from Datasets (it doesn't and it can't (cycling dependency)) --- .../core/services/dataset/dataset.service.ts | 7 ++++--- .../overview/dataset-overview.component.html | 5 +++-- .../overview/dataset-overview.component.ts | 19 ++++++++++--------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dmp-frontend/src/app/core/services/dataset/dataset.service.ts b/dmp-frontend/src/app/core/services/dataset/dataset.service.ts index e7306d139..b56e3b19c 100644 --- a/dmp-frontend/src/app/core/services/dataset/dataset.service.ts +++ b/dmp-frontend/src/app/core/services/dataset/dataset.service.ts @@ -90,7 +90,8 @@ export class DatasetService { return this.httpClient.get(this.actionUrl + 'getPDF/' + id, { responseType: 'blob', observe: 'response', headers: headerPdf }); } - public downloadJson(id: string): Observable> { - return this.httpClient.get(this.actionUrl + 'rda/' + id, { responseType: 'blob', observe: 'response' }); - } + //GK: NO + // public downloadJson(id: string): Observable> { + // return this.httpClient.get(this.actionUrl + 'rda/' + id, { responseType: 'blob', observe: 'response' }); + // } } diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html index 26ed8b1a1..6bef1df73 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html @@ -122,10 +122,11 @@ {{'GENERAL.FILE-TYPES.XML' | translate}} - - - +

{{ 'DMP-LISTING.ACTIONS.MAKE-PUBLIC' | translate }}

+ - @@ -132,7 +132,7 @@
-
+
@@ -145,7 +145,7 @@

{{ 'DMP-LISTING.ACTIONS.EXPORT' | translate }}

-
+
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss index 1923ad102..f68c825f8 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss @@ -30,14 +30,6 @@ // ********BUTTONS******** -.version-btn { - // width: 6.7em; - height: 1.8em; - border: 1px solid #707070; - border-radius: 4px; - background-color: transparent; -} - .id-btn { background: url("../../../../assets/images/NoPath.png") no-repeat center; width: 1em; @@ -194,7 +186,7 @@ } .doi-txt { - font-size: 0.8em; + font-size: 1em; letter-spacing: 0.009em; color: #7d7d7d; width: 12em; @@ -202,6 +194,7 @@ overflow: hidden; border: none; padding: 0px; + background-color: transparent; } .doi-panel { @@ -303,6 +296,17 @@ ::ng-deep .versions-select .mat-form-field-wrapper { background-color: transparent !important; padding-bottom: 0 !important; + width: 6.5rem; +} + +::ng-deep .versions-select .mat-form-field-wrapper .mat-form-field-flex { + padding: 0 0.5rem 0 0.625rem; + margin-bottom: 0.2rem; + font-weight: 500; +} + +::ng-deep mat-select .mat-select-arrow-wrapper { + vertical-align: bottom; } ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix { diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index ab89088c8..506537218 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -478,7 +478,10 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { if (result) { this.dmpService.publish(dmpId) .pipe(takeUntil(this._destroyed)) - .subscribe(() => { this.hasPublishButton = false }); + .subscribe(() => { + this.hasPublishButton = false; + this.reloadPage(); + }); } }); } diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html index 689af7f41..6c083243a 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html @@ -3,7 +3,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss index 68aba8ab8..0dc3837d6 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss @@ -19,6 +19,13 @@ $mat-card-header-size: 40px !default; text-align: left; } +.email-btn { + cursor: auto; + display: inline-block; + line-height: 2.25rem; + font-size: 0.875rem; +} + .dropdown-top { width: 0rem; border-bottom: 0.625rem solid #FFFFFF; From 07faec312436a793e84941dcb511e7edc0ec8737 Mon Sep 17 00:00:00 2001 From: gpapavgeri Date: Thu, 16 Jul 2020 12:59:34 +0300 Subject: [PATCH 04/10] Add contributors.html & licences link in footer --- .../overview/dataset-overview.component.ts | 4 +- .../assets/images/contributors/Image 82.png | Bin 0 -> 8734 bytes .../images/contributors/NoPath - Copy (7).png | Bin 0 -> 9729 bytes .../images/contributors/flag-greece.png | Bin 0 -> 2668 bytes .../src/assets/splash/about/contributors.html | 140 ++++++++++++++++++ .../src/assets/splash/about/faqs.html | 8 +- .../src/assets/splash/about/how-it-works.html | 12 +- dmp-frontend/src/assets/splash/contact.html | 5 +- dmp-frontend/src/assets/splash/css/footer.css | 2 +- dmp-frontend/src/assets/splash/css/styles.css | 40 ++++- dmp-frontend/src/assets/splash/index.html | 5 +- .../assets/splash/resources/co-branding.html | 5 +- .../assets/splash/resources/media-kit.html | 5 +- .../assets/splash/resources/user-guide.html | 5 +- 14 files changed, 208 insertions(+), 23 deletions(-) create mode 100644 dmp-frontend/src/assets/images/contributors/Image 82.png create mode 100644 dmp-frontend/src/assets/images/contributors/NoPath - Copy (7).png create mode 100644 dmp-frontend/src/assets/images/contributors/flag-greece.png create mode 100644 dmp-frontend/src/assets/splash/about/contributors.html diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts index d47436cd2..de0678940 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts @@ -485,9 +485,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { this.datasetWizardService.createDataset(this.datasetWizardModel) .pipe(takeUntil(this._destroyed)) .subscribe( - data => { - this.onUpdateCallbackSuccess(); - }, + data => this.onUpdateCallbackSuccess(), error => this.onUpdateCallbackError(error) ); } diff --git a/dmp-frontend/src/assets/images/contributors/Image 82.png b/dmp-frontend/src/assets/images/contributors/Image 82.png new file mode 100644 index 0000000000000000000000000000000000000000..91f9dba88a97712ee70b5b1980360d1758958a89 GIT binary patch literal 8734 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 IM6N<$f)>aDasU7T literal 0 HcmV?d00001 diff --git a/dmp-frontend/src/assets/images/contributors/NoPath - Copy (7).png b/dmp-frontend/src/assets/images/contributors/NoPath - Copy (7).png new file mode 100644 index 0000000000000000000000000000000000000000..56645e68f1e6e9d4bd7765fa9e237b0d4ef74431 GIT binary patch literal 9729 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 P00000NkvXXu0mjfAjso{ literal 0 HcmV?d00001 diff --git a/dmp-frontend/src/assets/images/contributors/flag-greece.png b/dmp-frontend/src/assets/images/contributors/flag-greece.png new file mode 100644 index 0000000000000000000000000000000000000000..bf8dfb0a3c3c56c8a455770a669f10d79a7f2fd9 GIT binary patch literal 2668 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 Jy@6N4{{W^#Qyl;R literal 0 HcmV?d00001 diff --git a/dmp-frontend/src/assets/splash/about/contributors.html b/dmp-frontend/src/assets/splash/about/contributors.html new file mode 100644 index 000000000..9921203a3 --- /dev/null +++ b/dmp-frontend/src/assets/splash/about/contributors.html @@ -0,0 +1,140 @@ + + + + + + + Argos + + + + + + + + + + + + + + + + + + +
+
+
+
About
+
+
+
Translators
+
+
+ Flag of Greece +
+

Athena Research & Innovation Center

+

Dimitra Aglamisi, Elli Papadopoulou

+
+
+
+ Flag of Spain +
+

Consorcio Madroño

+

Lanko López, Juan Corrales Correyero, Fernando González Ballesteros

+
+
+
+ Flag of Turkey +
+

Turkish Higher Education Council Research Data and Open Data working group

+
+
+
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/about/faqs.html b/dmp-frontend/src/assets/splash/about/faqs.html index f751e50ee..ec5a41823 100644 --- a/dmp-frontend/src/assets/splash/about/faqs.html +++ b/dmp-frontend/src/assets/splash/about/faqs.html @@ -36,6 +36,7 @@ How it works Roadmap faqs + Contributors
@@ -62,7 +63,7 @@
-
FAQs
+
About
FAQs
@@ -188,8 +189,9 @@
- Terms and conditions - Cookies policy + Οpensource licences + Terms and conditions + Cookies policy
diff --git a/dmp-frontend/src/assets/splash/about/how-it-works.html b/dmp-frontend/src/assets/splash/about/how-it-works.html index 7446523a2..622912912 100644 --- a/dmp-frontend/src/assets/splash/about/how-it-works.html +++ b/dmp-frontend/src/assets/splash/about/how-it-works.html @@ -35,6 +35,7 @@ How it works Roadmap faqs + Contributors
@@ -59,12 +60,12 @@
-
How it works
+
About
-
+
How it works
-

+

ARGOS is the joint effort of OpenAIRE and EUDAT to deliver an open platform for Data Management Planning that addresses FAIR and Open best practices and assumes no barriers for its use and adoption.

@@ -142,8 +143,9 @@
- Terms and conditions - Cookies policy + Οpensource licences + Terms and conditions + Cookies policy
diff --git a/dmp-frontend/src/assets/splash/contact.html b/dmp-frontend/src/assets/splash/contact.html index 4126e1872..77231cacb 100644 --- a/dmp-frontend/src/assets/splash/contact.html +++ b/dmp-frontend/src/assets/splash/contact.html @@ -124,8 +124,9 @@
- Terms and conditions - Cookies policy + Οpensource licences + Terms and conditions + Cookies policy
diff --git a/dmp-frontend/src/assets/splash/css/footer.css b/dmp-frontend/src/assets/splash/css/footer.css index 28cf11a9f..9a8a5b312 100644 --- a/dmp-frontend/src/assets/splash/css/footer.css +++ b/dmp-frontend/src/assets/splash/css/footer.css @@ -41,7 +41,7 @@ .conditions-policy { text-align: left; - text-decoration: underline; + text-decoration: underline !important; font-weight: 400; font-family: 'Roboto',sans-serif; font-size: 1rem; diff --git a/dmp-frontend/src/assets/splash/css/styles.css b/dmp-frontend/src/assets/splash/css/styles.css index 5bfb49ccf..1c2ff9e1e 100644 --- a/dmp-frontend/src/assets/splash/css/styles.css +++ b/dmp-frontend/src/assets/splash/css/styles.css @@ -135,7 +135,7 @@ p a { line-height: 2.75rem; font-family: 'Roboto', sans-serif; font-weight: 300; - color: #FFFFFF; + /* color: #FFFFFF; */ } .title-2 { @@ -323,3 +323,41 @@ hr { max-width: 900px; } } + +.card { + min-height: 14rem; + margin-bottom: 1.875rem; + box-shadow: 0px 3px 6px #00000029; +} + +.card-img { + transform: scale(0.5); +} + +.card-body { + display: flex; + flex-direction: column; + align-items: left; + justify-content: center; + padding: 1rem 1.25rem !important; +} + +.card-text-1 { + font-size: 1.125rem; + font-weight: bold; + text-transform: uppercase; +} + +.card-text-2 { + font-size: 1rem; + font-weight: 400; + opacity: 0.6; +} + +.flag { + border: 10px solid #EEEEEE; + border-radius: 50% !important; + padding-right: 0px !important; + padding-left: 0px !important; + transform: scale(0.45); +} diff --git a/dmp-frontend/src/assets/splash/index.html b/dmp-frontend/src/assets/splash/index.html index 626561f25..5805d69f4 100644 --- a/dmp-frontend/src/assets/splash/index.html +++ b/dmp-frontend/src/assets/splash/index.html @@ -371,8 +371,9 @@
- Terms and conditions - Cookies policy + Οpensource licences + Terms and conditions + Cookies policy
diff --git a/dmp-frontend/src/assets/splash/resources/co-branding.html b/dmp-frontend/src/assets/splash/resources/co-branding.html index ba37601ad..8564ff5c6 100644 --- a/dmp-frontend/src/assets/splash/resources/co-branding.html +++ b/dmp-frontend/src/assets/splash/resources/co-branding.html @@ -102,8 +102,9 @@
- Terms and conditions - Cookies policy + Οpensource licences + Terms and conditions + Cookies policy
diff --git a/dmp-frontend/src/assets/splash/resources/media-kit.html b/dmp-frontend/src/assets/splash/resources/media-kit.html index 527a2e005..53ed9559a 100644 --- a/dmp-frontend/src/assets/splash/resources/media-kit.html +++ b/dmp-frontend/src/assets/splash/resources/media-kit.html @@ -177,8 +177,9 @@
- Terms and conditions - Cookies policy + Οpensource licences + Terms and conditions + Cookies policy
diff --git a/dmp-frontend/src/assets/splash/resources/user-guide.html b/dmp-frontend/src/assets/splash/resources/user-guide.html index 846eb1705..ad06ae075 100644 --- a/dmp-frontend/src/assets/splash/resources/user-guide.html +++ b/dmp-frontend/src/assets/splash/resources/user-guide.html @@ -108,8 +108,9 @@
- Terms and conditions - Cookies policy + Οpensource licences + Terms and conditions + Cookies policy
From 182c2150691674587924ddbfa1ceeba9c3df8f17 Mon Sep 17 00:00:00 2001 From: gpapavgeri Date: Thu, 16 Jul 2020 18:32:56 +0300 Subject: [PATCH 05/10] minor changes in static pages --- .../src/assets/splash/about/contributors.html | 10 +- .../src/assets/splash/about/faqs.html | 8 +- .../src/assets/splash/about/how-it-works.html | 8 +- dmp-frontend/src/assets/splash/contact.html | 9 +- .../src/assets/splash/css/section.css | 7 + dmp-frontend/src/assets/splash/css/styles.css | 20 +-- dmp-frontend/src/assets/splash/index.html | 7 +- .../assets/splash/resources/co-branding.html | 65 +++++--- .../assets/splash/resources/media-kit.html | 142 +++++++++++------- .../assets/splash/resources/user-guide.html | 69 ++++++--- 10 files changed, 222 insertions(+), 123 deletions(-) diff --git a/dmp-frontend/src/assets/splash/about/contributors.html b/dmp-frontend/src/assets/splash/about/contributors.html index 9921203a3..45ad8b4df 100644 --- a/dmp-frontend/src/assets/splash/about/contributors.html +++ b/dmp-frontend/src/assets/splash/about/contributors.html @@ -63,10 +63,10 @@
About
-
Translators
+
Translators
- Flag of Greece + Flag of Greece

Athena Research & Innovation Center

Dimitra Aglamisi, Elli Papadopoulou

@@ -95,7 +95,7 @@
-
OpenAIRE-Advance receives funding from the European Union's Horizon 2020 +
ARGOS receives funding from the European Union's Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541.
@@ -116,7 +116,7 @@
- Οpensource licences + Οpensource licences Terms and conditions Cookies policy
@@ -125,7 +125,7 @@
Unless otherwise indicated, all materials created by OpenAIRE are licenced under
  -
ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
+
diff --git a/dmp-frontend/src/assets/splash/about/faqs.html b/dmp-frontend/src/assets/splash/about/faqs.html index ec5a41823..c97557b21 100644 --- a/dmp-frontend/src/assets/splash/about/faqs.html +++ b/dmp-frontend/src/assets/splash/about/faqs.html @@ -66,7 +66,7 @@
About
-
FAQs
+
FAQs
@@ -168,7 +168,7 @@
-
OpenAIRE-Advance receives funding from the European Union's Horizon 2020 +
ARGOS receives funding from the European Union's Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541.
@@ -189,7 +189,7 @@
- Οpensource licences + Οpensource licences Terms and conditions Cookies policy
@@ -198,7 +198,7 @@
Unless otherwise indicated, all materials created by OpenAIRE are licenced under
  -
ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
+
diff --git a/dmp-frontend/src/assets/splash/about/how-it-works.html b/dmp-frontend/src/assets/splash/about/how-it-works.html index 622912912..6252fbdf8 100644 --- a/dmp-frontend/src/assets/splash/about/how-it-works.html +++ b/dmp-frontend/src/assets/splash/about/how-it-works.html @@ -63,7 +63,7 @@
About
-
How it works
+
How it works

ARGOS is the joint effort of OpenAIRE and EUDAT to deliver an open platform for Data Management Planning @@ -122,7 +122,7 @@

-
OpenAIRE-Advance receives funding from the European Union's Horizon 2020 +
ARGOS receives funding from the European Union's Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541.
@@ -143,7 +143,7 @@
- Οpensource licences + Οpensource licences Terms and conditions Cookies policy
@@ -152,7 +152,7 @@
Unless otherwise indicated, all materials created by OpenAIRE are licenced under
  -
ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
+ diff --git a/dmp-frontend/src/assets/splash/contact.html b/dmp-frontend/src/assets/splash/contact.html index 77231cacb..9ff76cce4 100644 --- a/dmp-frontend/src/assets/splash/contact.html +++ b/dmp-frontend/src/assets/splash/contact.html @@ -36,6 +36,7 @@ How it works Roadmap faqs + Contributors @@ -67,7 +68,7 @@
Contact us to learn more
-
+
* Required fields
@@ -104,7 +105,7 @@
-
OpenAIRE-Advance receives funding from the European Union's Horizon 2020 +
ARGOS receives funding from the European Union's Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541..
@@ -124,7 +125,7 @@
- Οpensource licences + Οpensource licences Terms and conditions Cookies policy
@@ -133,7 +134,7 @@
Unless otherwise indicated, all materials created by OpenAIRE are licenced under
  -
ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
+ diff --git a/dmp-frontend/src/assets/splash/css/section.css b/dmp-frontend/src/assets/splash/css/section.css index 0f0ab10fc..f43025fb5 100644 --- a/dmp-frontend/src/assets/splash/css/section.css +++ b/dmp-frontend/src/assets/splash/css/section.css @@ -124,6 +124,7 @@ section.benefits { box-shadow: 0px 6px 15px #0000001A; border-radius: 36px; opacity: 1; + margin-bottom: 0.5rem; } .benefit-card-title { @@ -216,6 +217,12 @@ section.benefits { padding: 2rem 0rem; } +.list { + font-size: 0.87rem; + color: #212121; + opacity: 0.8; +} + section.media-kit-logo { background: #F3F3F3; opacity: 1; diff --git a/dmp-frontend/src/assets/splash/css/styles.css b/dmp-frontend/src/assets/splash/css/styles.css index 1c2ff9e1e..02cacc8d5 100644 --- a/dmp-frontend/src/assets/splash/css/styles.css +++ b/dmp-frontend/src/assets/splash/css/styles.css @@ -130,30 +130,30 @@ p a { } .title-1 { - text-align: left; - font-size: 2.37rem; line-height: 2.75rem; - font-family: 'Roboto', sans-serif; font-weight: 300; - /* color: #FFFFFF; */ + color: #FFFFFF; } .title-2 { - text-align: left; - font-size: 2.37rem; line-height: 2.75rem; - font-family: 'Roboto', sans-serif; font-weight: 700; color: #FFFFFF; } .title-3 { + opacity: 0.95; +} + +.title-3, .title-4 { + font-weight: 300; + color: #212121; +} + +.title-1, .title-2, .title-3, .title-4 { text-align: left; font-size: 2.37rem; font-family: 'Roboto', sans-serif; - font-weight: 300; - color: #212121; - opacity: 0.95; } .page-title { diff --git a/dmp-frontend/src/assets/splash/index.html b/dmp-frontend/src/assets/splash/index.html index 5805d69f4..d569ff587 100644 --- a/dmp-frontend/src/assets/splash/index.html +++ b/dmp-frontend/src/assets/splash/index.html @@ -36,6 +36,7 @@ How it works Roadmap faqs + Contributors @@ -350,7 +351,7 @@
-
OpenAIRE-Advance receives funding from the European Union's Horizon 2020 +
ARGOS receives funding from the European Union's Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541.
@@ -371,7 +372,7 @@
- Οpensource licences + Οpensource licences Terms and conditions Cookies policy
@@ -380,7 +381,7 @@
Unless otherwise indicated, all materials created by OpenAIRE are licenced under
  -
ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
+ diff --git a/dmp-frontend/src/assets/splash/resources/co-branding.html b/dmp-frontend/src/assets/splash/resources/co-branding.html index 8564ff5c6..7507fdfa3 100644 --- a/dmp-frontend/src/assets/splash/resources/co-branding.html +++ b/dmp-frontend/src/assets/splash/resources/co-branding.html @@ -9,14 +9,17 @@ - + - + @@ -24,7 +27,9 @@