fix params and hrefs

This commit is contained in:
Anton Romanov 2020-04-25 21:42:15 +04:00
parent d29416fb76
commit 1a3ffb7bab
7 changed files with 28 additions and 17 deletions

View File

@ -18,6 +18,6 @@ fi
ssh $USERSERVER "cd /tmp && rm -rf $ARTIFACT_NAME*.jar && echo `date` 'killed' >> log_$ARTIFACT_NAME"
scp build/libs/$ARTIFACT_NAME-0.1.0-SNAPSHOT.jar $USERSERVER:/tmp/$ARTIFACT_NAME-0.1.0-SNAPSHOT.jar
ssh $USERSERVER -f "cd /tmp/ && /opt/jdk-11/bin/java -jar $ARTIFACT_NAME-0.1.0-SNAPSHOT.jar -Xms 512m -Xmx 1024m --server.port=8080 --server.http.port=8443 --ng-tracker.debug_email='' --ng-tracker.base-url=http://193.110.3.124:8080 --ng-tracker.dev-mode=false --ng-tracker.driver-path=/home/user >> /home/user/logfile_$ARTIFACT_NAME" &
ssh $USERSERVER -f "cd /tmp/ && /opt/jdk-11/bin/java -jar $ARTIFACT_NAME-0.1.0-SNAPSHOT.jar -Xms 512m -Xmx 1024m --server.port=8080 --server.http.port=8443 --ng-tracker.base-url=http://193.110.3.124:8080 --ng-tracker.dev-mode=false --ng-tracker.driver-path=/home/user >> /home/user/logfile_$ARTIFACT_NAME" &
sleep 10
echo "is deployed"

View File

@ -13,6 +13,10 @@ public class Page {
public static final String GRANT_DASHBOARD = "/grant/dashboard.xhtml";
public static final String USER_LIST = "/admin/users.xhtml";
public static final String LOGOUT = "/logout";
public static final String CONFERENCE_DASHBOARD = "/conference/dashboard.xhtml";
;
public static final String PROJECT_DASHBOARD = "/conference/dashboard.xhtml";
;
public String getIndex() {
return INDEX;
@ -49,4 +53,12 @@ public class Page {
public String getGrant() {
return GRANT;
}
public String getConferenceDashboard() {
return CONFERENCE_DASHBOARD;
}
public String getProjectDashboard() {
return PROJECT_DASHBOARD;
}
}

View File

@ -1,5 +1,6 @@
package ru.ulstu.index.controller;
import ru.ulstu.core.navigation.Page;
import ru.ulstu.index.model.Section;
import javax.annotation.PostConstruct;
@ -15,10 +16,10 @@ public class IndexView {
@PostConstruct
public void init() {
sections.add(new Section("Статьи", "papers.jpg"));
sections.add(new Section("Конференции", "conf.jpg"));
sections.add(new Section("Гранты", "grants.jpg"));
sections.add(new Section("Проекты", "projects.jpg"));
sections.add(new Section("Статьи", Page.PAPER_DASHBOARD, "papers.jpg"));
sections.add(new Section("Конференции", Page.CONFERENCE_DASHBOARD, "conf.jpg"));
sections.add(new Section("Гранты", Page.GRANT_DASHBOARD, "grants.jpg"));
sections.add(new Section("Проекты", Page.PROJECT_DASHBOARD, "projects.jpg"));
}
public List<Section> getSections() {

View File

@ -1,27 +1,25 @@
package ru.ulstu.index.model;
public class Section {
private String title;
private String image;
private final String title;
private final String image;
private final String href;
public Section(String title, String image) {
public Section(String title, String href, String image) {
this.title = title;
this.image = image;
this.href = href;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getImage() {
return image;
}
public void setImage(String image) {
this.image = image;
public String getHref() {
return href;
}
}

View File

@ -46,7 +46,7 @@
<p:dataTable value="#{grantDashboardView.grants}" var="grant" paginator="true"
paginatorPosition="bottom"
rows="10" id="grantsTable"
widgetVar="grantsTable" emptyMessage="Не найдено подходящих статей"
widgetVar="grantsTable" emptyMessage="Не найдено подходящих грантов"
selection="#{grantDashboardView.selectedGrants}" rowKey="#{grant.id}">
<f:facet name="header">
<p:outputPanel>

View File

@ -9,7 +9,7 @@
style="text-align:center">
<p:panel id="pnl" header="#{section.title}" style="text-align:center;">
<h:panelGrid columns="1" style="width:100%;">
<h:outputLink value="/paper/papers.xhtml">
<h:outputLink value="#{section.href}">
<p:graphicImage style="width:100%" name="img/main/#{section.image}"/>
</h:outputLink>
</h:panelGrid>

View File

@ -42,7 +42,7 @@ spring.liquibase.enabled=true
ng-tracker.base-url=http://127.0.0.1:8080
ng-tracker.undead-user-login=admin
ng-tracker.dev-mode=false
ng-tracker.debug_email=romanov73@gmail.com
ng-tracker.debug_email=
ng-tracker.use-https=false
ng-tracker.check-run=false
ng-tracker.driver-path=