From fa6f0f88e08cd1e930bdd6a30e0b3e35054d8dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20J=C3=A4ntsch?= Date: Wed, 29 May 2019 17:06:29 +0200 Subject: [PATCH] 0.1.4 --- bash_scripts/generate.sh | 38 +++++++++++++++++++++++ bash_scripts/regenerate.sh | 0 public/data/class/example/test.jpg | 0 public/data/class/example/user.json | 28 ++++++++++++++--- src/jsx/main.jsx | 48 +++++++++++++++++++++-------- src/jsx/ui/student.jsx | 3 ++ src_less/main.less | 8 ++++- test/random.js | 18 +++++++++++ 8 files changed, 125 insertions(+), 18 deletions(-) create mode 100755 bash_scripts/generate.sh create mode 100644 bash_scripts/regenerate.sh create mode 100644 public/data/class/example/test.jpg create mode 100644 test/random.js diff --git a/bash_scripts/generate.sh b/bash_scripts/generate.sh new file mode 100755 index 0000000..2bdb37f --- /dev/null +++ b/bash_scripts/generate.sh @@ -0,0 +1,38 @@ +#!/bin/bash +# relative or absolute path where the classes are +path=../public/data/class/* + +# image filetype needs to be the same +file_type=*.jpg + +# REGEX +reg='(.*)class\/([0\-9A\-z_]*)\/([0\-9A\-z_]*)\.jpg' +#reg='class\/([0\-9A\-z_]*)' +for i in $path +do + if [ -d "$i" ]; then + #echo "$i" + + json_file=$i/user.json + + printf '{\n"user":[\n'>$json_file + + for j in $i/* + do + + if [[ $j == ${file_type} ]]; then + if [[ $j =~ ${reg} ]]; then + echo "${BASH_REMATCH[3]}" + printf '"'>>$json_file + printf ${BASH_REMATCH[3]}>>$json_file + printf '",\n'>>$json_file + else + echo "TEST2" + echo $j + fi + fi + done + cat $json_file | rev | cut -c 3- | rev + + fi +done \ No newline at end of file diff --git a/bash_scripts/regenerate.sh b/bash_scripts/regenerate.sh new file mode 100644 index 0000000..e69de29 diff --git a/public/data/class/example/test.jpg b/public/data/class/example/test.jpg new file mode 100644 index 0000000..e69de29 diff --git a/public/data/class/example/user.json b/public/data/class/example/user.json index c60c08c..06f2437 100644 --- a/public/data/class/example/user.json +++ b/public/data/class/example/user.json @@ -1,8 +1,26 @@ { - "user":[ - "max_mustermann", - "bernd_baecker", - "fred_fischer", - "charley_" + "user": [ + "stanislav_teun", + "christina_juliana", + "nele_mechthild", + "hans-guenther_Patrick", + "irmingrad_eckhard", + "felix_leonore", + "ruediger_gregor", + "kai_tanja", + "hans_judit", + "susann_laurenz", + "mathis_raphaela", + "stanislav_teun", + "christina_juliana", + "nele_mechthild", + "hans-guenther_Patrick", + "irmingrad_eckhard", + "felix_leonore", + "ruediger_gregor", + "kai_tanja", + "hans_judit", + "susann_laurenz", + "mathis_raphaela" ] } \ No newline at end of file diff --git a/src/jsx/main.jsx b/src/jsx/main.jsx index 29e3051..18d7421 100644 --- a/src/jsx/main.jsx +++ b/src/jsx/main.jsx @@ -13,12 +13,17 @@ export class Main extends React.Component{ selected:"-", students:[], stud_html:[], - choose:1 + choose:1, + + prank:30, + prank_i:0, + prank_delay:100 } this.selCh = this.selCh.bind(this); this.changeChoosen = this.changeChoosen.bind(this); this.choose = this.choose.bind(this); + this.chooseInit = this.chooseInit.bind(this); var me = this; Classes.load_Classes((data)=>{ @@ -51,21 +56,40 @@ export class Main extends React.Component{ changeChoosen(e){ this.setState({choose:e.target.value}) } + chooseInit(){ + this.setState({prank_i:0}) + this.choose(); + } choose(){ + for(var i in User.user_arr){ + User.user_arr[i].appear(); + } var me = this; var c = []; - for(var i = 0;i me.state.prank_i){ + me.setState({prank_i:me.state.prank_i+1}) + me.choose(); + } + + },me.state.prank_delay) } render(){ return ( @@ -83,7 +107,7 @@ export class Main extends React.Component{
- +
diff --git a/src/jsx/ui/student.jsx b/src/jsx/ui/student.jsx index 869e309..0b05fa6 100644 --- a/src/jsx/ui/student.jsx +++ b/src/jsx/ui/student.jsx @@ -30,6 +30,9 @@ export class Student extends React.Component{ var url = '/data/class/student.svg'; this.setState({img_url:url}); } + appear(){ + this.setState({dis:""}); + } disappear(){ this.setState({dis:"disappear"}); } diff --git a/src_less/main.less b/src_less/main.less index f079373..c86d339 100644 --- a/src_less/main.less +++ b/src_less/main.less @@ -26,8 +26,14 @@ html,body{ border: 1px solid #454545; margin: 5px; padding: 5px; + transition: cubic-bezier(0.075, 0.82, 0.165, 1) 1000ms; &.disappear{ - opacity: 0; + opacity: 0.09; + transition: cubic-bezier(0.075, 0.82, 0.165, 1) 1000ms; + } + &.appear{ + opacity: 1; + transition: cubic-bezier(0.075, 0.82, 0.165, 1) 1000ms; } .user_img{ img{ diff --git a/test/random.js b/test/random.js new file mode 100644 index 0000000..066a551 --- /dev/null +++ b/test/random.js @@ -0,0 +1,18 @@ +var users = 10; +var needed = 5; + +var already_picked = []; + +for(var i = 0;i