diff --git a/TMP/g46375.png b/TMP/g46375.png new file mode 100644 index 0000000..16027e4 Binary files /dev/null and b/TMP/g46375.png differ diff --git a/compatibility.php b/compatibility.php old mode 100644 new mode 100755 index de99021..65daff4 --- a/compatibility.php +++ b/compatibility.php @@ -1,53 +1,52 @@
-
-
-

Analisi compatibilità del modulo

-
+
+
+

Analisi compatibilità del modulo

- -
- -
-
-
Luca
-
Stagista
-

Modulo differenze culturali

-
-

Compatibilità knowledge

-
-

Prestazioni storiche sul corso

-
-

Carico didattico sostenibile

-
-
-
- -
-
-
Sara
-
Venditore
-

Modulo differenze culturali

-
-

Compatibilità knowledge

-
-

Prestazioni storiche sul corso

-
-

Carico didattico sostenibile

-
-
+
+ +
+ +
+
+
Luca
+
Stagista
+

Modulo differenze culturali

+
+

Compatibilità knowledge

+
+

Prestazioni storiche sul corso

+
+

Carico didattico sostenibile

+
-
- -
-
- - +
+
+
Sarah
+
Venditore
+

Modulo differenze culturali

+
+

Compatibilità knowledge

+
+

Prestazioni storiche sul corso

+
+

Carico didattico sostenibile

+
+
+ + +
+
+ + +
+
diff --git a/css/styles.css b/css/styles.css index 1bd2dbe..b0275a9 100644 --- a/css/styles.css +++ b/css/styles.css @@ -14536,12 +14536,7 @@ a:hover { transform: translate(-50%, -50%); } -/* line 66, global.scss */ -.bg-alpha { - background: rgba(255, 255, 255, 0.5); -} - -/* line 70, global.scss */ +/* line 65, global.scss */ .pattern { background: white; background-image: url(../images/pattern.jpg); @@ -14549,24 +14544,24 @@ a:hover { background-position: center bottom; } -/* line 77, global.scss */ +/* line 72, global.scss */ .radius { border-radius: 3px; } -/* line 81, global.scss */ +/* line 76, global.scss */ .radius-bottom { border-radius: 0 0 3px 3px; } -/* line 86, global.scss */ +/* line 81, global.scss */ #MainContent { top: 50px; z-index: 0; overflow: hidden; } -/* line 92, global.scss */ +/* line 87, global.scss */ #map { width: 100%; border-radius: 3px; @@ -14574,7 +14569,7 @@ a:hover { padding: 10px; } -/* line 102, global.scss */ +/* line 97, global.scss */ #dropLoading { display: none; position: fixed; @@ -14585,7 +14580,7 @@ a:hover { background: rgba(0, 0, 0, 0.8); overflow: hidden; } -/* line 111, global.scss */ +/* line 106, global.scss */ #dropLoading #animation_container { position: absolute; height: 300px; @@ -14594,7 +14589,7 @@ a:hover { left: 50%; transform: translate(-50%, -50%); } -/* line 120, global.scss */ +/* line 115, global.scss */ #dropLoading #countdown { position: fixed; height: 30px; @@ -14675,6 +14670,16 @@ button.discard, .button.discard { background: black; } +/* line 48, forms.scss */ +input[type=button].dotted, +input[type=submit].dotted, +button.dotted, +.button.dotted { + background: white; + color: #2f2f2f; + border: 2px dotted #2f2f2f; + border-radius: 6px; +} /* line 2, header.scss */ header { @@ -15020,3 +15025,133 @@ header .container .row .menu ul li.active a:hover, header .container .row .menu height: 25px; background: #bf0f3d; } + +/* line 3, sections/plans.scss */ +.plans { + width: 100%; +} +/* line 6, sections/plans.scss */ +.plans .phone { + position: relative; + height: 570px; + width: 245px; + background-image: url(../images/phone.png); + background-position: center bottom; + background-repeat: no-repeat; + background-size: 245px 500px; +} +/* line 15, sections/plans.scss */ +.plans .phone .name { + position: absolute; + left: 60px; + top: 5px; + font-size: 0.75rem; + font-weight: 700; +} +/* line 22, sections/plans.scss */ +.plans .phone .rule { + position: absolute; + left: 60px; + top: 25px; + font-size: 0.625rem; +} +/* line 28, sections/plans.scss */ +.plans .phone .avatar { + position: absolute; + left: 0; + top: 0; + height: 50px; + width: 50px; +} +/* line 34, sections/plans.scss */ +.plans .phone .avatar img { + height: 50px; + width: 50px; +} +/* line 40, sections/plans.scss */ +.plans .phone .content { + position: absolute; + top: 145px; + left: 12px; + height: 371px; + width: 222px; +} +/* line 47, sections/plans.scss */ +.plans .phone .content .cloud { + display: none; + position: relative; + width: 80%; + font-size: 0.75rem; + font-weight: 500; + padding: 10px; + margin: 10px 0; + border-radius: 8px; +} +/* line 57, sections/plans.scss */ +.plans .phone .content .cloud.left { + left: 15px; + background: #f6e7ea; + border: 1px solid #c8bcbe; +} +/* line 61, sections/plans.scss */ +.plans .phone .content .cloud.left:before { + content: ''; + border: solid 11px transparent; + border-right-color: #c8bcbe; + position: absolute; + left: 0; + top: 50%; + transform: translate(-100%, -50%); +} +/* line 70, sections/plans.scss */ +.plans .phone .content .cloud.left:after { + content: ''; + border: solid 10px transparent; + border-right-color: #f6e7ea; + position: absolute; + left: 0; + top: 50%; + transform: translate(-100%, -50%); +} +/* line 81, sections/plans.scss */ +.plans .phone .content .cloud.right { + left: calc(20% - 13px); + background: #d4eeed; + border: 1px solid #b0c8c6; +} +/* line 85, sections/plans.scss */ +.plans .phone .content .cloud.right:before { + content: ''; + border: solid 11px transparent; + border-left-color: #b0c8c6; + position: absolute; + right: 0; + top: 50%; + transform: translate(100%, -50%); +} +/* line 94, sections/plans.scss */ +.plans .phone .content .cloud.right:after { + content: ''; + border: solid 10px transparent; + border-left-color: #d4eeed; + position: absolute; + right: 0; + top: 50%; + transform: translate(100%, -50%); +} +/* line 105, sections/plans.scss */ +.plans .phone .content .cloud.empty { + width: 100%; + text-align: center; + padding: 0; +} +/* line 114, sections/plans.scss */ +.plans .phone .input { + position: absolute; + top: 516px; + left: 12px; + height: 42px; + width: 222px; + border-radius: 0 0 26px 26px; + overflow: hidden; +} diff --git a/header.php b/header.php old mode 100644 new mode 100755 index 62a4e66..ee0ed13 --- a/header.php +++ b/header.php @@ -3,14 +3,14 @@
-
+
    -
  • ">Menu
    • -
  • ">Risultati
    • -
  • ">Piani attivi
    • -
  • ">Report
    • -
  • ">Moduli disponibili
    • +
  • ">Menu
    • +
  • ">Risultati
    • +
  • ">Piani attivi
    • +
  • ">Report
    • +
  • ">Moduli disponibili
    • diff --git a/images/phone.png b/images/phone.png new file mode 100644 index 0000000..16027e4 Binary files /dev/null and b/images/phone.png differ diff --git a/index.php b/index.php old mode 100644 new mode 100755 diff --git a/js/compatibility.js b/js/compatibility.js index c94c18b..6ab9b43 100644 --- a/js/compatibility.js +++ b/js/compatibility.js @@ -22,7 +22,7 @@ $(document).ready(()=>{ loading.fadeIn() setTimeout(()=>{ loading.fadeOut(()=>{ - window.location='/plans' + window.location='plans' }) },7000) diff --git a/js/modules.js b/js/modules.js index 35fcf40..2b037d2 100644 --- a/js/modules.js +++ b/js/modules.js @@ -13,7 +13,7 @@ function drop(ev) { ev.preventDefault(); - const target = $(ev.currentTarget).find('.modules-container') + const target = $(ev.currentTarget) const overlay = $('#dropConfirm') const loading = $('#dropLoading') const discard = overlay.find('.discard') @@ -40,9 +40,15 @@ function drop(ev) { setTimeout(()=>{ const module = $('#'+data) + loading.fadeOut() - target.append('
    '+module.text()+'
    ') - },7000) + + if(target.find('.modules-container').length){ + target.find('.modules-container').append('
    '+module.text()+'
    ') + }else{ + $('.modules-container').append('
    '+module.text()+'
    ') + } + },700) once = false } @@ -58,4 +64,14 @@ function dragLeave(ev) { +$(document).ready(()=>{ + + $(document).keypress((event)=> { + if(event.which == 32){ + window.location = 'compatibility' + } + }) +}) + + diff --git a/js/plans.js b/js/plans.js index 8d1c8b6..6370960 100644 --- a/js/plans.js +++ b/js/plans.js @@ -1 +1,29 @@ + +$(document).ready(()=>{ + + const plans = $('.plans') + const clouds = plans.find('.cloud') + const delay = 1000 + let timer = 0 + + setTimeout(()=>{ + clouds.each((index,elem)=>{ + const el = $(elem) + timer = index*delay + + if(el.hasClass('empty')){ + timer -= delay + } + + setTimeout(()=>{ + if(!el.hasClass('empty')){ + $('#notify1')[0].play() + } + el.fadeIn(500) + },timer) + + }) + },delay) + +}) diff --git a/modules.php b/modules.php old mode 100644 new mode 100755 index 3ca7e49..5555d6f --- a/modules.php +++ b/modules.php @@ -72,7 +72,7 @@
    -
    +
    Duomo
    2
    @@ -110,7 +110,7 @@
    Luca
    Stagista
    -
    +

    Azioni in corso

    @@ -122,9 +122,9 @@
    -
    Sara
    +
    Sarah
    Venditore
    -
    +

    Azioni in corso

    diff --git a/plans.php b/plans.php old mode 100644 new mode 100755 index 8d1c8b6..14a62a9 --- a/plans.php +++ b/plans.php @@ -1 +1,55 @@ - +
    + +
    +
    +

    Monitoring dispositivi

    +
    +
    + +
    +
    +
    +
    +
    +
    +
    Luca
    +
    Stagista
    +
    +
    + Ciao Luca!
    + Il modulo "differenze culturali" è disponibile. +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    Sarah
    +
    Venditore
    +
    +
    + Ciao Sara!
    + Il modulo "differenze culturali" è disponibile. +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + diff --git a/scripts/plans.php b/scripts/plans.php new file mode 100644 index 0000000..97c21aa --- /dev/null +++ b/scripts/plans.php @@ -0,0 +1,2 @@ + + diff --git a/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/forms.scssc b/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/forms.scssc index e4df7c7..898b936 100644 Binary files a/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/forms.scssc and b/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/forms.scssc differ diff --git a/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc b/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc index 19297c1..239356b 100644 Binary files a/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc and b/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc differ diff --git a/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/variables.scssc b/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/variables.scssc index 34391b7..ad0163c 100644 Binary files a/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/variables.scssc and b/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/variables.scssc differ diff --git a/scss/forms.scss b/scss/forms.scss index b4d4917..157055b 100644 --- a/scss/forms.scss +++ b/scss/forms.scss @@ -44,6 +44,12 @@ button, } &.discard{ background: black; + } + &.dotted{ + background: white; + color: $dark-grey; + border: 2px dotted $dark-grey; + border-radius: 6px; } } diff --git a/scss/global.scss b/scss/global.scss index 6aadcdc..fa13ba9 100644 --- a/scss/global.scss +++ b/scss/global.scss @@ -62,11 +62,6 @@ a{ } - -.bg-alpha{ - background: rgba(255,255,255,0.5); -} - .pattern{ background: white; background-image: url(../images/pattern.jpg); diff --git a/scss/sections/plans.scss b/scss/sections/plans.scss index 8d1c8b6..02d2777 100644 --- a/scss/sections/plans.scss +++ b/scss/sections/plans.scss @@ -1 +1,124 @@ - + + +.plans{ + width: 100%; + + .phone{ + position: relative; + height: 570px; + width: 245px; + background-image: url(../images/phone.png); + background-position: center bottom; + background-repeat: no-repeat; + background-size: 245px 500px; + + .name{ + position: absolute; + left: 60px; + top: 5px; + font-size: $font-12; + font-weight: 700; + } + .rule{ + position: absolute; + left: 60px; + top: 25px; + font-size: $font-10; + } + .avatar{ + position: absolute; + left: 0; + top: 0; + height: 50px; + width: 50px; + img{ + height: 50px; + width: 50px; + } + } + + .content{ + position: absolute; + top: 145px; + left: 12px; + height: 371px; + width: 222px; + + .cloud{ + display: none; + position: relative; + width: 80%; + font-size: $font-12; + font-weight: 500; + padding: 10px; + margin: 10px 0; + border-radius: 8px; + + &.left{ + left: 15px; + background: $pink; + border: 1px solid $dark-pink; + &:before{ + content: ''; + border: solid 11px transparent; + border-right-color: $dark-pink; + position: absolute; + left: 0; + top: 50%; + transform: translate(-100%, -50%); + } + &:after{ + content: ''; + border: solid 10px transparent; + border-right-color: $pink; + position: absolute; + left: 0; + top: 50%; + transform: translate(-100%, -50%); + } + } + + &.right{ + left: calc(20% - 13px); + background: $azure; + border: 1px solid $dark-azure; + &:before{ + content: ''; + border: solid 11px transparent; + border-left-color: $dark-azure; + position: absolute; + right: 0; + top: 50%; + transform: translate(100%, -50%); + } + &:after{ + content: ''; + border: solid 10px transparent; + border-left-color: $azure; + position: absolute; + right: 0; + top: 50%; + transform: translate(100%, -50%); + } + } + + &.empty{ + width: 100%; + text-align: center; + padding: 0; + } + + } + } + + .input{ + position: absolute; + top: 516px; + left: 12px; + height: 42px; + width: 222px; + border-radius: 0 0 26px 26px; + overflow: hidden; + } + } +} diff --git a/scss/variables.scss b/scss/variables.scss index 61d9906..6fae475 100644 --- a/scss/variables.scss +++ b/scss/variables.scss @@ -55,3 +55,8 @@ $red: #bf0f3d; $grey: #ccc; $light-grey: #f2f2f2; $dark-grey: #2f2f2f; + +$pink: #f6e7ea; +$dark-pink: #c8bcbe; +$azure: #d4eeed; +$dark-azure: #b0c8c6; diff --git a/sounds/message.wav b/sounds/message.wav new file mode 100644 index 0000000..571fecf Binary files /dev/null and b/sounds/message.wav differ