Skip to content

Commit

Permalink
Merge pull request #29 from H2-invent/feature/assignItems
Browse files Browse the repository at this point in the history
Feature/assign items
  • Loading branch information
holzi1005 authored Jun 30, 2020
2 parents ed64264 + 193032e commit 2068721
Show file tree
Hide file tree
Showing 57 changed files with 1,461 additions and 132 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ [email protected]
defaultEmailName=test

AKADEMIE_EMAIL=[email protected]
DEFAULT_EMAIL=[email protected]
DEV_EMAIL=[email protected]

###> symfony/swiftmailer-bundle ###
Expand Down
2 changes: 1 addition & 1 deletion config/packages/oneup_flysystem.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ oneup_flysystem:
adapters:
asset_adapter:
local:
directory: '%kernel.project_dir%/public%app.path.product_images%'
directory: '%kernel.project_dir%/public%app.path.images%'
intern_adapter:
local:
directory: '%kernel.project_dir%/data'
Expand Down
2 changes: 1 addition & 1 deletion config/packages/vich_uploader.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ vich_uploader:
storage: flysystem
mappings:
profil_picture:
uri_prefix: '%app.path.product_images%'
uri_prefix: '%app.path.images%'
upload_destination: intern_adapter
namer: vich_uploader.namer_uniqid
delete_on_update: true
Expand Down
3 changes: 2 additions & 1 deletion config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
# Put parameters here that don't need to change on each machine where the app is deployed
# https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
parameters:
app.path.product_images: /uploads/images/products
app.path.images: /uploads/images/products
secret: '%env(APP_SECRET)%'
projectRoot: '%kernel.root_dir%'
akademieEmail: '%env(AKADEMIE_EMAIL)%'
defaultEmail: '%env(DEFAULT_EMAIL)%'
cronToken: '%env(CRON_TOKEN)%'
cronIPAdress: '%env(CRON_IPADRESS)%'

Expand Down
154 changes: 148 additions & 6 deletions public/css/style.css
Original file line number Diff line number Diff line change
@@ -1,23 +1,82 @@
/*
DEMO STYLE
Default Style
*/

:root {
--main-color: rgb(0, 88, 176);
--main-color-hover: rgb(0, 158, 251);
--main-color-activ: rgb(179, 230, 255);
--sec-color: rgb(245, 26, 32);
--sec-color-hover: rgb(201, 2, 0);
--sec-color-activ: rgb(244, 105, 104);
--contrast-base: rgb(85, 83, 80);
--contrast-dark: rgb(23, 21, 18);
--contrast-light: rgb(144, 142, 140);
--contrast-extra-light: rgb(232, 228, 226);
--contrast-white: rgb(253, 253, 253);
}

/* Background Colors items*/
.bg-vvt {
background-color: #34ce57;
color: black !important;
}

.bg-dsfa {
background-color: #00e676;
color: black !important;
}

.bg-audit {
background-color: #00e5ff;
color: black !important;
}

.bg-tom {
background-color: #0e4377;
color: whitesmoke !important;
}

.bg-daten {
background-color: #6f42c1;
color: whitesmoke !important;
}

.bg-av {
background-color: #7e57c2;
color: whitesmoke !important;
}

.bg-kontakt {
background-color: #6a1b9a;
color: whitesmoke !important;
}

.bg-akademie {
background-color: #ba8b00;
color: black !important;
}

.bg-vorfall {
background-color: #ff1744;
color: whitesmoke !important;
}

/* poppins-regular - latin */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
src: url('../fonts/poppins-v9-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Poppins Regular'), local('Poppins-Regular'),
url('../fonts/poppins-v9-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/poppins-v9-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/poppins-v9-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/poppins-v9-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/poppins-v9-latin-regular.woff') format('woff'), /* Modern Browsers */
url('../fonts/poppins-v9-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/poppins-v9-latin-regular.svg#Poppins') format('svg'); /* Legacy iOS */
}
body {
font-family: 'Poppins';
background: #fafafa;
background: var(--contrast-extra-light);
}

p {
Expand Down Expand Up @@ -71,7 +130,7 @@ a:focus {
#sidebar {
min-width: 250px;
max-width: 250px;
background: #b9bbbe;
background: var(--contrast-light);
color: #fff;
transition: all 0.3s;
}
Expand All @@ -82,7 +141,7 @@ a:focus {

#sidebar .sidebar-header {
padding: 20px;
background: #b9bbbe;
background: var(--contrast-light);
}

#sidebar ul.components {
Expand Down Expand Up @@ -217,4 +276,87 @@ label.required:after {
#footer {
position: absolute;
bottom: 0px;
}


/* ---------------------------------------------------
Custom Buttons
----------------------------------------------------- */
.btn-primary {
background-color: var(--main-color) !important;
}

.btn-secondary {
background-color: var(--sec-color) !important;
}

.btn-info {
background-color: var(--contrast-base) !important;
}


#snackbar {
visibility: hidden;
width: 100%;

background-color: var(--contrast-base);
color: #fff;
text-align: center;
border-radius: 2px;
padding: 16px;
position: fixed;
z-index: 1;
right: 0;
bottom: 30px;
font-size: 17px;
}

#snackbar.show {
visibility: visible;
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
animation: fadein 0.5s, fadeout 0.5s 2.5s;
}

@-webkit-keyframes fadein {
from {
bottom: 0;
opacity: 0;
}
to {
bottom: 30px;
opacity: 1;
}
}

@keyframes fadein {
from {
bottom: 0;
opacity: 0;
}
to {
bottom: 30px;
opacity: 1;
}
}

@-webkit-keyframes fadeout {
from {
bottom: 30px;
opacity: 1;
}
to {
bottom: 0;
opacity: 0;
}
}

@keyframes fadeout {
from {
bottom: 30px;
opacity: 1;
}
to {
bottom: 0;
opacity: 0;
}
}
21 changes: 21 additions & 0 deletions public/icons/data.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/icons/dsfa.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions public/icons/online-learning.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2068721

Please sign in to comment.