Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reorder files in main repository folder #249

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Reorder files in main repository folder #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a45dc69
Reorder files in main repository folder
Dynnammo Jun 21, 2023
df9989c
Move simulate_players in correct folder
Dynnammo Jun 21, 2023
05c7fb7
Fix CI
Dynnammo Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
run: |
echo ${{ secrets.DOTENV }} | base64 --decode > .env
set -o allexport; source .env; set +o allexport
chmod +x run_tests.sh
chmod +x scripts/run_tests.sh
- name: Run tests
run: |
./run_tests.sh a
./scripts/run_tests.sh a
pipenv run coverage xml
# - name: Report results to DeepSource
# run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ RUN pip install -r requirements.txt && \
apt remove -y jq gcc

COPY classquiz/ /app/classquiz/
COPY image_cleanup.py /app/image_cleanup.py
COPY docs/image_cleanup.py /app/image_cleanup.py
COPY alembic.ini /app/
COPY migrations/ /app/migrations/
COPY *start.sh /app/
COPY *scripts/start.sh /app/
COPY gunicorn_conf.py /app/


Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<div align='center'>
<h2 align='center'>ClassQuiz</h2>
<img src='logo.png' alt='ClassQuiz Logo' height='100px' width='100px'>
<img src='docs/logo.png' alt='ClassQuiz Logo' height='100px' width='100px'>
<p align='center'>
The open-source quiz-platform!
<br/>
Expand Down
0 SocketIo.md → docs/SocketIo.md
View file
Open in desktop
File renamed without changes.
0 live_redis_data.md → docs/live_redis_data.md
View file
Open in desktop
File renamed without changes.
0 logo.png → docs/logo.png
View file
Open in desktop
File renamed without changes
8 changes: 4 additions & 4 deletions frontend/src/routes/docs/develop/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<ol>
<li>
Prepare all the containers:
<pre><code>./run_tests.sh +</code></pre>
<pre><code>./scripts/run_tests.sh +</code></pre>
</li>
<li>
Start the Python-server:
Expand All @@ -92,8 +92,8 @@
<pre><code>arq classquiz.worker.WorkerSettings</code></pre>
</li>
</ol>
<p>If you're done developing: <code>./run_tests.sh -</code></p>
<p>If you want to run all the tests: <code>./run_tests.sh a</code></p>
<p>If you're done developing: <code>./scripts/run_tests.sh -</code></p>
<p>If you want to run all the tests: <code>./scripts/run_tests.sh a</code></p>
</li>
<li>
Add the following line to your <code>/etc/hosts</code>-file, so you can visit ClassQuiz
Expand Down Expand Up @@ -157,5 +157,5 @@
<pre><code>pnpm run format && pnpm run lint</code></pre>

<h4>Backend</h4>
<p>Run the tests: <code>./run_tests.sh a</code></p>
<p>Run the tests: <code>./scripts/run_tests.sh a</code></p>
</article>
0 prestart.sh → scripts/prestart.sh
View file
Open in desktop
File renamed without changes.
0 run_tests.sh → scripts/run_tests.sh
View file
Open in desktop
File renamed without changes.
0 start.sh → scripts/start.sh
View file
Open in desktop
File renamed without changes.
0 image_cleanup.py → utils/image_cleanup.py
View file
Open in desktop
File renamed without changes.
0 import_to_meili.py → utils/import_to_meili.py
View file
Open in desktop
File renamed without changes.
0 init_db.py → utils/init_db.py
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions simulate_players.py → utils/simulate_players.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def __main__():
for i in range(NUMBER_OF_PLAYERS):
arr_of_sio_instances.append(socketio.Client())

def joined_game(data):
def joined_game():
print("JOINED!!!!")

def time_sync(data):
Expand All @@ -32,8 +32,6 @@ def set_question_number(data):
global q_index

for i in arr_of_sio_instances:
# print(int(data))
# print("hi!", data)
random_num = random.randint(0, len(data["question"]["answers"]) - 1)
print(random_num, q_index)
i.emit(
Expand Down