Skip to content

Commit

Permalink
Merge pull request #5 from ConductionNL/staging
Browse files Browse the repository at this point in the history 
Ingres updates
  • Loading branch information
@rubenvdlinde
rubenvdlinde authored Dec 12, 2019
2 parents 167db9f + 1cc0611 commit 289419c
Show file tree
Hide file tree
Showing 21 changed files with 1,586 additions and 19 deletions.
5 changes: 3 additions & 2 deletions api/config/bundles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
Conduction\CommonGroundBundle\CommonGroundBundle::class => ['all' => true],
Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true],
Tbbc\MoneyBundle\TbbcMoneyBundle::class => ['all' => true],
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true],
Tbbc\MoneyBundle\TbbcMoneyBundle::class => ['all' => true],
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
];
5 changes: 0 additions & 5 deletions api/helm/templates/certificate.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ spec:
secretName: {{ include "name" . }}-{{ .Values.settings.env }}-cert
duration: 24h
renewBefore: 12h
{{- if eq .Values.settings.env "prod" }}
commonName: {{ .Values.settings.name }}.{{ .Values.settings.domain }}
{{- else }}
commonName: {{ .Values.settings.name }}.{{ .Values.settings.env }}.{{ .Values.settings.domain }}
{{- end }}
dnsNames:
{{- if eq .Values.settings.env "prod" }}
- {{ .Values.settings.name }}.{{ .Values.settings.domain }}
Expand Down
17 changes: 5 additions & 12 deletions api/helm/templates/ingress.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ metadata:
helm.sh/chart: {{ include "chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
tls:
- hosts:
# {{- range .Values.settings.domains }}
# - {{ .domain | quote }}
# {{- end }}
- {{ .Values.settings.domain }}
secretName: {{ include "name" . }}-{{ .Values.settings.env }}-cert
rules:
Expand All @@ -32,20 +31,14 @@ spec:
- host: {{ .Values.settings.domain }}
http:
paths:
- path: /.well-known/*
backend:
serviceName: {{ include "name" . }}-letsencrypt
servicePort: 80
- path: /*
backend:
- backend:
serviceName: {{ include "name" . }}
servicePort: 80
{{- else }}
- host: {{ .Values.settings.env }}.{{ .Values.settings.domain }}
http:
paths:
- path: /*
backend:
- backend:
serviceName: {{ include "name" . }}
servicePort: 80
{{- end }}
3 changes: 3 additions & 0 deletions api/symfony.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@
"nikic/php-parser": {
"version": "v4.2.2"
},
"php": {
"version": "7.3"
},
"php-cs-fixer/diff": {
"version": "v1.3.0"
},
Expand Down
43 changes: 43 additions & 0 deletions api/templates/home/add.html.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<li>
<a name="add"></a>
<div class="timeline-badge"></div>
<div class="timeline-line"></div>
<div class="timeline-panel">
<div class="timeline-body">
<div class="top-link">
<a href="javascript:void(0);" onclick="scrollToAnchor('top')"><span class="glyphicon glyphicon-menu-up"></span></a>
</div>
<!-- Contact Us section -->
<h1>Component toevoegen</h1>
<h5>U kunt componenten toevoegen aan dit overzicht zonder een acount aan te maken</h5>
<div class="row">
<div class="col-sm-12 panel">
<div class="panel-body">
<form action="{{ path('app_component_quickadd') }}">
<div class="form-horizontal">
<div class="row">
<div class="col-md-12">
<p>U hoeft niet in te loggen of een account aan te maken om componenten toe te voegen aan deze pagina, u kunt hieronder de URL van de desbetreffende repository opgeven. Wij lezen het component dan automatisch in, is de eigenaar van het component reeds bij ons bekend dan wordt het component ook op de overzicht pagina weergegeven. Is de eigenaar nog niet bij ons bekend dan zullen wij deze eerst handmatig valideren.</p>
</div>
</div>
<div class="row">
<div class="col-md-8">
<input type="text" class="form-control" placeholder="https://github.com/ConductionNL/love-common-ground" id="url" name="url">
</div>
<div class="col-md-4">
<input type="submit" value="Insturen" class="btn background-1" type="button"></input>
</div>
</div>
<div class="row">
<div class="col-md-12">
<p>Let op! voor de beta versie van deze pagina ondersteunen wij alleen github.</p>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</li>
128 changes: 128 additions & 0 deletions api/templates/home/api-modal.html.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
{# templates/home/modal.html.twig #}
<!-- Modal -->
<div class="modal fade" id="component-{{ component.id }}" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<button type="button" class="modal-close-btn" data-dismiss="modal" aria-label="Close"><span class="glyphicon glyphicon-remove"></span></button>
<div class="modal-body container-fluid portfolio web">
<!-- Carousel -->
<div id="carousel-portfolio-{{ component.id }}" class="carousel slide" data-ride="carousel">
<div class="carousel-inner" role="listbox">

{#
<div class="item active">
<img src="{{ component.logo }}" alt="" />
</div>
for image in item.images %}
<div class="item active">
<img src="{{ component.logo }}" alt="" />
</div>
{% endfor #}
</div>

<!-- Controls -->
<!--
Remove these controls if you are only using one image in the carousel.
<a class="left carousel-control" href="#carousel-portfolio-{{ component.id }}" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
</a>
<a class="right carousel-control" href="#carousel-portfolio-{{ component.id }}" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
</a>
-->
</div>
<div class="row">
<div class="col-md-5">
<div class="portfolio-title">
<div class="portfolio-icon {% if component.type == 'source'%}
background-1
{% elseif component.type == 'tool' %}
background-3
{% else %}
background-2
{% endif %}">
<div>
{% if component.type == 'source'%}
<i class="fad fa-database"></i>
{% elseif component.type == 'tool' %}
<i class="fad fa-tools"></i>
{% else %}{# lets default to application#}
<i class="fad fa-browser"></i>
{% endif %}
</div>
</div>
<div class="title">
<h4>{{ component.name|capitalize|replace({'-': " ", "_" : " "}) }}</h4>
{% if component.version %}Versie <em>{{ component.version }}</em>{% endif %}
{#
Licentie <a href="{{ item.license.url}}">{{ item.license.name}}</a><br />
Ontwikkelaar <a href="{{ item.license.url}}">{{ item.license.name}}</a><br />
Eigenaar <a href="{{ item.license.url}}">{{ item.license.name}}</a><br />
#}
</div>
<br />
{% if component.docs|length > 0 %}
<p>
<b>Documentatie</b><br />
{% for key,doc in component.docs if doc %}
<a href="#" onclick="showDoc('.component-{{ component.id }}-doc', '.component-{{ component.id }}-doc-{{ key }}')">{{ key|capitalize|replace({'-': " ", "_" : " "}) }}</a><br />
{% endfor %}
</p>
{% endif %}
{% if component.tags|length > 0 %}
<p>
<b>Informatie Model</b><br />
{% for tag in component.tags %}
{{ tag.name }}<br />
{% endfor %}
</p>
{% endif %}
{% if component.git is defined %}
<p>
<b>Repositories</b> <br />
<a href="{{ component.git }}" target="_blank">{{ component.gitType|capitalize|replace({'-': " ", "_" : " "}) }}</a><br />
</p>
{% endif %}
{% if component.openapi.servers is defined and component.openapi.servers|length > 0 %}
<p>
<b>Servers</b> <br />
{% for server in component.openapi.servers if (server.url is defined and server.description is defined) %}
<a href="{{ server.url }}" target="_blank">{{ server.description|capitalize|replace({'-': " ", "_" : " "}) }}</a><br />
{% endfor %}
</p>
{% endif %}
{% if component.openapi.externalDocs is defined and component.openapi.externalDocs|length > 0 %}
<p>
<b>Verwijzingen</b><br />
{% for externalDoc in component.openapi.externalDocs if (externalDoc.url is defined and externalDoc.description is defined) %}
<a href="{{ externalDoc.url }}" target="_blank">{{ externalDoc.description|capitalize|replace({'-': " ", "_" : " "}) }}</a><br />
{% endfor %}
</p>
{% endif %}
<p>
<b>Credits</b><br />
{% for organisation in component.organisations %}
<a href="{{ organisation.url }}" target="_blank">{{ organisation.name }}</a><br />
{% endfor %}
</p>
</div>
<div >
<a href="{{ path('app_component_refresh', {'component': component.id}) }}">Refresh</a>
</div>
</div>
<div class="modal-text col-md-7">
<div id="accordion-{{ component.id }}">
{% if component.docs|length > 0 %}
{% for key,doc in component.docs if doc %}
<div class="component-{{ component.id }}-doc component-{{ component.id }}-doc-{{ key }} {% if key!= 'readme'%}hide{%else%}show{% endif %}">{{ doc | raw }}</div>
{% endfor %}
{% else %}
Er kon geen documentatie worden gevonden voor dit component, bevat het een readme.md bestand?
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
37 changes: 37 additions & 0 deletions api/templates/home/api-thumb.html.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{# templates/home/modal.html.twig #}


<!-- Thumb -->
<div class="col-md-4 col-sm-6 portfolio {{ component.type }} web panel" data-toggle="modal" data-target="#component-{{ component.id }}">
<div class="panel-body">
<div class="portfolio-title">
<div class="portfolio-icon {% if component.type == 'source'%}
background-1
{% elseif component.type == 'tool' %}
background-3
{% else %}
background-2
{% endif %}">
<div>
{% if component.type == 'source'%}
<i class="fad fa-database"></i>
{% elseif component.type == 'tool' %}
<i class="fad fa-tools"></i>
{% else %}{# lets default to application#}
<i class="fad fa-browser"></i>
{% endif %}
</div>
</div>
<div class="title">
<h4>{{ component.name|length > 20 ? component.name|slice(0, 20) ~ '...' : component.name|capitalize|replace({'-': " ", "_" : " "}) }}</h4>
<em>{{ component.description|slice(0, 250) }}</em>
</div>
</div>
</div>
<!--
<div class="portfolio-image">
{% if component.logo is defined and component.logo is not empty %}
<img src="{{ component.logo }}" alt="" />
{% endif %}
</div> -->
</div>
32 changes: 32 additions & 0 deletions api/templates/home/backlog.html.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{# templates/home/index.html.twig #}

{% extends 'base.html.twig' %}

{% block body %}
<div class="main-content container fluid-container">
<!-- Main timeline -->
<ul id="timeline" class="timeline">
<li>
<a name="section-1"></a>
<div class="timeline-badge"></div>
<div class="timeline-line"></div>
<div class="timeline-panel">
<div class="timeline-body">
<div class="top-link">
<a href="javascript:void(0);" onclick="scrollToAnchor('top')"><span class="glyphicon glyphicon-menu-up"></span></a>
</div>
<!-- What We Do section -->
<h1>Welkom bij het common ground componenten overzicht</h1>
<h5>Waar delen vermenigvuldingen is</h5>
</div>
</div>
</li>

</ul>
</div>
<div class="content-area footer">
(c) <a href="http://www.conduction.nl" target="_blank">Conduction</a> {{ "now"|date("Y") }}</a>
</div>
</div>

{% endblock %}
Loading

0 comments on commit 289419c

Please sign in to comment.