Skip to content

M
memsource
Commit d8905263 by Jan Hrabal
Options

work in progress

parent 39f3e271
Showing with 828 additions and 5 deletions
backend/.classpath 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
backend/.project 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>memsource</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
backend/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
backend/.settings/org.eclipse.jdt.core.prefs 0 → 100644
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=1.8
backend/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
backend/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.jh</groupId>
<artifactId>memsource</artifactId>
<version>0.0.1</version>
<packaging>jar</packaging>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.6.RELEASE</version>
<relativePath />
</parent>
<properties>
<project.build.date>${maven.build.timestamp}</project.build.date>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
<project.build.date>${maven.build.timestamp}</project.build.date>
<java.version>8</java.version>
</properties>
<dependencies>
<!-- Spring dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate5</artifactId>
</dependency>
<!-- db -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.5</version>
</dependency>
<!-- testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<filtering>false</filtering>
<directory>${basedir}/src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
<resource>
<filtering>false</filtering>
<directory>${basedir}/src/main/resources</directory>
</resource>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>*.properties</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
<filtering>false</filtering>
<directory>${basedir}/src/test/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
<testResource>
<filtering>false</filtering>
<directory>${basedir}/src/test/resources</directory>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourcepath>${basedir}/dummy</sourcepath>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version><!--$NO-MVN-MAN-VER$-->
<configuration>
<release>${java.version}</release>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>com.springsource.repository.maven.release</id>
<url>http://repo.springsource.org/release/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>com.springsource.repository.bundles.release</id>
<url>http://repository.springsource.com/maven/bundles/release</url>
</repository>
<repository>
<id>com.springsource.repository.bundles.external</id>
<url>http://repository.springsource.com/maven/bundles/external</url>
</repository>
</repositories>
</project>
backend/src/main/java/com/jh/memsource/DbConfig.java 0 → 100644
package com.jh.memsource;
import javax.sql.DataSource;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
@Configuration
@ConfigurationProperties(prefix = "spring.datasource")
@EntityScan(basePackages = {"com.jh.memsource"})
public class DbConfig extends HikariConfig {
@Bean
@Primary
public DataSource dataSource() {
return new HikariDataSource(this);
}
}
backend/src/main/java/com/jh/memsource/MemsourceApplication.java 0 → 100644
package com.jh.memsource;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module.Feature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@SpringBootApplication
@EnableJpaRepositories
@ComponentScan(basePackages = {"com.jh.memsource"})
@Configuration
public class MemsourceApplication {
/**
* Default object mapper
*
* @return
*/
@Bean
public ObjectMapper objectMapper() {
ObjectMapper om = new ObjectMapper();
om.setSerializationInclusion(Include.NON_NULL);
om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
om.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
om.registerModule(new JavaTimeModule());
Hibernate5Module module = new Hibernate5Module();
module.disable(Feature.USE_TRANSIENT_ANNOTATION);
module.enable(Feature.REPLACE_PERSISTENT_COLLECTIONS);
om.registerModule(module);
return om;
}
public static void main(String[] args) {
SpringApplication.run(MemsourceApplication.class, args);
}
}
backend/src/main/java/com/jh/memsource/MemsourceConfig.java 0 → 100644
package com.jh.memsource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import com.fasterxml.jackson.databind.ObjectMapper;
@Configuration
public class MemsourceConfig {
@Autowired
private ObjectMapper objectMapper;
}
backend/src/main/java/com/jh/memsource/MvcConfig.java 0 → 100644
package com.jh.memsource;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import com.fasterxml.jackson.databind.ObjectMapper;
@Configuration
public class MvcConfig implements WebMvcConfigurer {
@Autowired
private ObjectMapper objectMapper;
@Override
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
final MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setObjectMapper(objectMapper);
converters.add(converter);
}
}
backend/src/main/java/com/jh/memsource/project/Project.java 0 → 100644
package com.jh.memsource.project;
public class Project {
private String name;
private String status;
private String sourceLanguage;
private String targetLanguage;
}
backend/src/main/java/com/jh/memsource/project/ProjectApiController.java 0 → 100644
package com.jh.memsource.project;
import java.util.Collections;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class ProjectApiController {
@Autowired
private ProjectService service;
@GetMapping("/projects")
public @ResponseBody List<ProjectDTO> getSettings() {
/*
List<Project> projects = service.getProjects();
if (projects == null) {
return Collections.emptyList();
}
//map to DTO
return projects.stream().map(p -> new ProjectDTO()).collect(Collectors.toList());
*/
return Collections.singletonList(new ProjectDTO("test", "done", "en", new String[] { "de" }));
}
}
backend/src/main/java/com/jh/memsource/project/ProjectDTO.java 0 → 100644
package com.jh.memsource.project;
public class ProjectDTO {
private String name;
private String status;
private String sourceLanguage;
private String[] targetLanguages;
public ProjectDTO() {
super();
}
public ProjectDTO(String name, String status, String sourceLanguage, String[] targetLanguages) {
super();
this.name = name;
this.status = status;
this.sourceLanguage = sourceLanguage;
this.targetLanguages = targetLanguages;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getSourceLanguage() {
return sourceLanguage;
}
public void setSourceLanguage(String sourceLanguage) {
this.sourceLanguage = sourceLanguage;
}
public String[] getTargetLanguages() {
return targetLanguages;
}
public void setTargetLanguages(String[] targetLanguages) {
this.targetLanguages = targetLanguages;
}
}
backend/src/main/java/com/jh/memsource/project/ProjectService.java 0 → 100644
package com.jh.memsource.project;
import java.util.Collections;
import java.util.List;
import org.springframework.stereotype.Service;
@Service
public class ProjectService {
public List<Project> getProjects() {
return Collections.emptyList();
}
}
backend/src/main/java/com/jh/memsource/settings/Settings.java 0 → 100644
package com.jh.memsource.settings;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import com.fasterxml.jackson.annotation.JsonIgnore;
@Entity
public class Settings {
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "idGenerator")
@SequenceGenerator(name = "idGenerator", sequenceName = "ID_GENERATOR", allocationSize = 1)
@Column(name = "ID")
@JsonIgnore
private Long id;
@Column(name = "USERNAME")
private String username;
@Column(name = "PASSWORD")
private String password;
public Settings() {
super();
}
public Settings(Long id, String username, String password) {
super();
this.id = id;
this.username = username;
this.password = password;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Settings other = (Settings) obj;
if (id == null) {
if (other.id != null)
return false;
} else if (!id.equals(other.id))
return false;
return true;
}
}
backend/src/main/java/com/jh/memsource/settings/SettingsApiController.java 0 → 100644
package com.jh.memsource.settings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.server.ResponseStatusException;
@RestController
public class SettingsApiController {
@Autowired
private SettingsService service;
@GetMapping("/settings")
public @ResponseBody Settings getSettings() {
Settings s = service.getSettings();
if (s == null) {
throw new ResponseStatusException(HttpStatus.NOT_FOUND);
}
return s;
}
@PutMapping("/settings")
@ResponseStatus
public void saveSettings(@RequestBody Settings settings) {
service.saveSettings(settings);
}
}
backend/src/main/java/com/jh/memsource/settings/SettingsRepository.java 0 → 100644
package com.jh.memsource.settings;
import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.NonUniqueResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
import org.springframework.stereotype.Repository;
@Repository
public class SettingsRepository {
@PersistenceContext
private EntityManager entityManager;
/**
* Returns stored settings or null
*
* @return
*/
public Settings fetch() {
Query q = entityManager.createQuery("from Settings");
try {
return (Settings) q.getSingleResult();
} catch (NoResultException e) {
return null;
} catch (NonUniqueResultException e) {
throw new IllegalStateException("Multiple settings records found");
} catch (Exception e) {
throw e;
}
}
/**
* Store provided settings
*
* @param settings must not be null
*/
public void store(Settings settings) {
Objects.requireNonNull(settings, "Settings must not be null");
Settings stored = fetch();
if (stored == null) {
entityManager.persist(settings);
return;
}
stored.setUsername(settings.getUsername());
stored.setPassword(settings.getPassword());
}
}
backend/src/main/java/com/jh/memsource/settings/SettingsService.java 0 → 100644
package com.jh.memsource.settings;
import javax.transaction.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class SettingsService {
private SettingsRepository repo;
@Transactional
public Settings getSettings() {
return repo.fetch();
}
@Transactional
public void saveSettings(Settings settings) {
repo.store(settings);
}
@Autowired
public void setRepo(SettingsRepository repo) {
this.repo = repo;
}
}
backend/src/main/resources/application.properties 0 → 100644
spring.datasource.jdbcUrl=jdbc:postgresql://localhost:5432/memsource
spring.datasource.username=postgres
spring.datasource.password=password
spring.datasource.driver-class-name=org.postgresql.Driver
spring.jpa.open-in-view=false
spring.jpa.show-sql=false
spring.jpa.properties.hibernate.id.new_generator_mappings=true
spring.jpa.properties.hibernate.ddl-auto=none
spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
\ No newline at end of file
backend/target/classes/application.properties 0 → 100644
spring.datasource.jdbcUrl=jdbc:postgresql://localhost:5432/memsource
spring.datasource.username=postgres
spring.datasource.password=password
spring.datasource.driver-class-name=org.postgresql.Driver
spring.jpa.open-in-view=false
spring.jpa.show-sql=false
spring.jpa.properties.hibernate.id.new_generator_mappings=true
spring.jpa.properties.hibernate.ddl-auto=none
spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
\ No newline at end of file
db/create_db.sql 0 → 100644
CREATE DATABASE memsource
WITH
OWNER = postgres
ENCODING = 'utf8'
TABLESPACE = pg_default
CONNECTION LIMIT = -1;
db/init_db.sql 0 → 100644
CREATE SEQUENCE ID_GENERATOR;
CREATE TABLE SETTINGS (
ID INT8 NOT NULL,
USERNAME VARCHAR,
PASSWORD VARCHAR,
PRIMARY KEY (ID)
);
frontend/package.json
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
"name": "frontend", "name": "frontend",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"proxy": "http://localhost:8080",
"dependencies": { "dependencies": {
"@material-ui/core": "^4.4.2",
"@material-ui/icons": "^4.4.1", "@material-ui/icons": "^4.4.1",
"react": "^16.9.0", "react": "^16.9.0",
"react-dom": "^16.9.0", "react-dom": "^16.9.0",
......
frontend/src/lib/settings.js
/** /**
* Implements functionality for managing settings on backend and providing it for other components * Implements settings management
*/ */
import React, { useState, useEffect, createContext } from 'react'; import React, { useState, useEffect, createContext } from 'react';
...@@ -19,9 +19,11 @@ export const saveSettings = async () => { ...@@ -19,9 +19,11 @@ export const saveSettings = async () => {
export const defaultCtxValue = { export const defaultCtxValue = {
pending: true, fetching: true,
fetched: false, fetched: false,
saving: false,
login: null, login: null,
password: null, password: null,
...@@ -39,13 +41,15 @@ export default (Wrapped) => (props) => { ...@@ -39,13 +41,15 @@ export default (Wrapped) => (props) => {
//wrapped backend calls //wrapped backend calls
async function fetch() { async function fetch() {
updateSettings({ ...settings, pending: true }); updateSettings({ ...settings, fetching: true });
let response = await fetchSettings(); let response = await fetchSettings();
updateSettings({ ...settings, pending: false, fetched: true }); updateSettings({ ...settings, fetching: false, fetched: true });
} }
async function save() { async function save() {
updateSettings({ ...settings, saving: true });
let response = await saveSettings();
updateSettings({ ...settings, saving: false });
} }
//try to fetch settings once the component is mounted //try to fetch settings once the component is mounted
......
frontend/src/pages/projects/index.js 0 → 100644
import React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
import Divider from '@material-ui/core/Divider';
import ListItemText from '@material-ui/core/ListItemText';
import ListItemAvatar from '@material-ui/core/ListItemAvatar';
import Avatar from '@material-ui/core/Avatar';
import Typography from '@material-ui/core/Typography';
const useStyles = makeStyles(theme => ({
root: {
width: '100%',
maxWidth: 360,
backgroundColor: theme.palette.background.paper,
},
inline: {
display: 'inline',
},
}));
const Project = (props) => {
return (
<ListItem alignItems="flex-start">
<ListItemAvatar>
<Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" />
</ListItemAvatar>
<ListItemText
primary="Summer BBQ"
secondary={
<React.Fragment>
<Typography
component="span"
variant="body2"
className={classes.inline}
color="textPrimary"
>
to Scott, Alex, Jennifer
</Typography>
{" — Wish I could come, but I'm out of town this…"}
</React.Fragment>
}
/>
</ListItem>
);
}
export default (props) => {
return (
<div>
</div>
);
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment