cami/Bachelorthesis_Code
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Wiki Activity

Merge pull request 'Format/Autoformat' (#92) from format/autoformat into main

Browse source
This commit is contained in:
cami 2021-06-30 00:15:10 +00:00
commit 23e07b1484
7 changed files with 15 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/Dockerfile.bak
View file

@ -12,7 +12,7 @@ FROM python:3.9
# Install pip requirements # Install pip requirements
ADD requirements.txt . ADD requirements.txt .
RUN python -m pip install -r requirements.txt RUN python -m pip install -r requirements.txt
WORKDIR /app WORKDIR /app
ADD . /app ADD . /app

2
frontend/Dockerfile
View file

@ -10,7 +10,7 @@ ENV PATH /app/node_modules/.bin:$PATH
COPY package.json ./ COPY package.json ./
COPY package-lock.json ./ COPY package-lock.json ./
RUN npm install RUN npm install
# add app # add app
COPY . ./ COPY . ./

2
frontend/Dockerfile.prod
View file

@ -6,7 +6,7 @@ COPY package.json ./
COPY package-lock.json ./ COPY package-lock.json ./
RUN npm ci --silent RUN npm ci --silent
RUN npm install react-scripts -g --silent RUN npm install react-scripts -g --silent
COPY . ./ COPY . ./
RUN npm run build RUN npm run build
FROM nginx:latest FROM nginx:latest

2
frontend/README.md
View file

@ -69,8 +69,6 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify) This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
## Other things ## Other things
https://www.youtube.com/watch?v=3swBjngU2ns https://www.youtube.com/watch?v=3swBjngU2ns

30
frontend/issues.sh
View file

@ -1,30 +0,0 @@
# Labels: backend, bug, content, design, duplicate, enhancement, frontend, help wanted, invalid, question, wontfix,
ISSUE_TITLE="Buttons gleichmässig darstellen"
DESC="Die Buttons sollen alle die gleiche Breite haben"
LABELS="design,frontend,enhancement"
DEADLINE="2021-06-23"
tea issue create --title "${ISSUE_TITLE}" --description "${DESC}" --labels "${LABELS}" --deadline "${DEADLINE}"
ISSUE_TITLE="login backend implementieren"
DESC=""
LABELS="backend,enhancement"
DEADLINE="2021-06-25"
tea issue create --title "${ISSUE_TITLE}" --description "${DESC}" --labels "${LABELS}" --deadline "${DEADLINE}"
ISSUE_TITLE="registrieren implementieren backend"
DESC=""
LABELS="backend,enhancement"
DEADLINE="2021-06-25"
tea issue create --title "${ISSUE_TITLE}" --description "${DESC}" --labels "${LABELS}" --deadline "${DEADLINE}"
ISSUE_TITLE="Umfrage erstellen (für neue Teilnehmer)"
DESC=""
LABELS="frontend,enhancement,backend"
DEADLINE="2021-06-25"
tea issue create --title "${ISSUE_TITLE}" --description "${DESC}" --labels "${LABELS}" --deadline "${DEADLINE}"
ISSUE_TITLE="Datenerhebung der Maus und Tastatur"
DESC=""
LABELS="frontend,backend,enhancement"
DEADLINE="2021-06-27"
tea issue create --title "${ISSUE_TITLE}" --description "${DESC}" --labels "${LABELS}" --deadline "${DEADLINE}"

8
frontend/src/components/pages/Ueber.js
View file

@ -8,11 +8,15 @@ export default function Ueber() {
<div className="sitePage"> <div className="sitePage">
<h1>Über das Projekt</h1> <h1>Über das Projekt</h1>
<p> <p>
Im Rahmen meiner Bachelorthesis an der Fernfachhochschule Schweiz möchte ich der Frage nachgehen, wie sich die Verhaltensmerkmale in unterschiedlichen Situationen unterscheiden. Hierfür habe ich eine Webanwendung entwickelt, welche die Nutzerinnen und Nutzer möglichst Im Rahmen meiner Bachelorthesis an der Fernfachhochschule Schweiz
möchte ich der Frage nachgehen, wie sich die Verhaltensmerkmale in
unterschiedlichen Situationen unterscheiden. Hierfür habe ich eine
Webanwendung entwickelt, welche die Nutzerinnen und Nutzer möglichst
einfach durch die Studie führt. einfach durch die Studie führt.
</p> </p>
<p> <p>
Falls Sie Fragen haben, können Sie diese jederzeit per Mail stellen. Gerne kann ich auch meine Disposition zur Verfügung stellen. Falls Sie Fragen haben, können Sie diese jederzeit per Mail stellen.
Gerne kann ich auch meine Disposition zur Verfügung stellen.
</p> </p>
</div> </div>
<Footer /> <Footer />

13
frontend/src/components/pages/Umfrage.js
View file

@ -14,7 +14,7 @@ export default function Umfrage() {
const [skills, setSkills] = useState(""); const [skills, setSkills] = useState("");
let surveyIsValid = true; let surveyIsValid = true;
let errorMessage = "" let errorMessage = "";
const onSubmitClick = (e) => { const onSubmitClick = (e) => {
e.preventDefault(); e.preventDefault();
@ -26,19 +26,19 @@ export default function Umfrage() {
}; };
if (!Number(age)) { if (!Number(age)) {
errorMessage += "age is not a number\n" errorMessage += "age is not a number\n";
surveyIsValid = false; surveyIsValid = false;
} }
if (gender === "DEFAULT" || gender === "") { if (gender === "DEFAULT" || gender === "") {
errorMessage += "choose gender\n" errorMessage += "choose gender\n";
surveyIsValid = false; surveyIsValid = false;
} }
if (education === "DEFAULT" || education === "") { if (education === "DEFAULT" || education === "") {
errorMessage += "choose edu\n" errorMessage += "choose edu\n";
surveyIsValid = false; surveyIsValid = false;
} }
if (skills === "DEFAULT" || skills === "") { if (skills === "DEFAULT" || skills === "") {
errorMessage += "choose skills\n" errorMessage += "choose skills\n";
surveyIsValid = false; surveyIsValid = false;
} }
@ -49,8 +49,7 @@ export default function Umfrage() {
method: "post", method: "post",
body: JSON.stringify(opts), body: JSON.stringify(opts),
}); });
} } else {
else {
console.log(errorMessage); console.log(errorMessage);
} }
}; };