Skip to content

Commit

Permalink
Remove code for Reverve
Browse files Browse the repository at this point in the history
  • Loading branch information
Willem (W.F.) Veelenturf committed Feb 6, 2019
1 parent e936f67 commit 293be5a
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 511 deletions.
15 changes: 15 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: '3'

services:

web:
image: maven:3.6.0-jdk-8
restart: always
container_name: web
working_dir: /app
volumes:
- ./:/app
- $HOME/.m2:/root/.m2
ports:
- "8080:8080"
command: mvn spring-boot:run -Drun.profiles=docker
3 changes: 0 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,6 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>community.flock.eco.fundraising.ApplicationKt</mainClass>
<profiles>
<profile>local</profile>
</profiles>
</configuration>
</plugin>

Expand Down
28 changes: 28 additions & 0 deletions src/it/resources/bootstrap-local.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
flock.fundraising.name=Doneasy Local

flock.fundraising.load-data.enabled=true
flock.fundraising.load-data.stub=true

flock.fundraising.donations.successUrl=https://bring-the-elephant-home.nl/donate-here-success
flock.fundraising.donations.failureUrl=https://bring-the-elephant-home.nl/donate-here-failure

flock.fundraising.donations.cors.allowedOrigins=https://bring-the-elephant-home.nl

flock.eco.feature.payment.buckaroo.requestUri=testcheckout.buckaroo.nl/json/transaction
flock.eco.feature.payment.buckaroo.websiteKey=KAVKwJUQW8
flock.eco.feature.payment.buckaroo.secretKey=9RTb9U82yeWKMY7df94T622

flock.eco.feature.mailchimp.apiKey=eb9782113f8bf150e2a52417c8d11c53-us16
flock.eco.feature.mailchimp.requestUrl=https://us16.api.mailchimp.com/3.0
flock.eco.feature.mailchimp.listId=63e254f3de

spring.datasource.url=jdbc:h2:mem:mydb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
spring.datasource.username=sa
spring.datasource.password=
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.platform=h2

spring.cloud.gcp.sql.enabled=false

logging.level.org.hibernate.SQL=DEBUG
logging.level.org.springframework.security=DEBUG
12 changes: 1 addition & 11 deletions src/main/react/app/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import AppLayout from './AppLayout'

import DashboardFeature from '../dashboard/DashboardFeature'
import DonationFeature from '../donation/DonationFeature'
import ReserveFeature from '../reserve/ReserveFeature'
import MailchimpFeature from '../mailchimp/MailchimpFeature'
import ReserveStatistics from '../reserve/ReserveStatistics'
import TransactionFeature from '../transaction/TransactionFeature'

import MemberFeature from 'flock-eco-feature-member/member/MemberFeature'
Expand Down Expand Up @@ -48,7 +46,7 @@ class App extends React.Component {
.then(res => res.json())
.then(json => {
if(!json.loggedIn){
window.location.replace("/oauth2/authorization/google");
window.location.replace("/login");
}else{
AuthorityUtil.setAuthorities(json.authorities)
this.setState({
Expand Down Expand Up @@ -93,14 +91,6 @@ class App extends React.Component {
<MailchimpFeature/>
)}/>

<Route path='/reservations' exact render={(props) => (
<ReserveFeature/>
)}/>

<Route path='/reservations/:id' exact render={(props) => (
<ReserveStatistics reserve={props.match.params.id}/>
)}/>

<Route path='/users' exact render={(props) => (
<UserFeature/>
)}/>
Expand Down
15 changes: 2 additions & 13 deletions src/main/react/app/AppDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import MemberIcon from '@material-ui/icons/Face';
import UserIcon from '@material-ui/icons/People';
import ProfileIcon from '@material-ui/icons/Person';
import SettingsIcon from '@material-ui/icons/SettingsSharp';
import ReserveIcon from '@material-ui/icons/AccountBalance';
import MailIcon from '@material-ui/icons/Mail';
import SepaIcon from '@material-ui/icons/CompareArrows';

Expand Down Expand Up @@ -168,19 +167,9 @@ class AppDrawer extends React.Component {

</List>

<List>
<AuthorityUtil has="ReserveAuthority.READ">
<div>
<ListItem button component="a" href="#/reservations">
<ListItemIcon>
<ReserveIcon/>
</ListItemIcon>
<ListItemText primary="Reservations"/>
</ListItem>
</div>
</AuthorityUtil>
<Divider/>

<Divider/>
<List>

<AuthorityUtil has="UserAuthority.READ">
<div>
Expand Down
137 changes: 0 additions & 137 deletions src/main/react/reserve/ReserveDialog.js

This file was deleted.

76 changes: 0 additions & 76 deletions src/main/react/reserve/ReserveFeature.js

This file was deleted.

Loading

0 comments on commit 293be5a

Please sign in to comment.