Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d8cd4b1
Add sass structure!
PiotrRynio Dec 20, 2020
c46db18
Add sass files -> Fixed last commit
PiotrRynio Dec 20, 2020
d1e2753
Init prettierrc
PiotrRynio Dec 21, 2020
be4891f
Bump node-notifier from 8.0.0 to 8.0.1 (#2)
dependabot[bot] Dec 22, 2020
69e5090
#3 Configure scss support with Parcel
Dec 22, 2020
ee5add9
#3 Add background image
Dec 22, 2020
0b19a30
Bump ini from 1.3.5 to 1.3.8 in /swapi-json-server
dependabot[bot] Dec 20, 2020
058795f
#38 Add HTML elements structure
DomiZet Dec 29, 2020
440bcbd
#38 Main view structure rendering driven by JavaScript
PawelSzambelan Dec 30, 2020
7419f71
#24 Add Player logic for asking and answering questions
MateuszNaKodach Dec 30, 2020
e9e78ab
Add 'Husky' & "pretty-quick"
PiotrRynio Dec 30, 2020
fbaf571
Test of working
PiotrRynio Dec 30, 2020
618c014
Finish Logo
PiotrRynio Dec 31, 2020
dd26746
Merge pull request #44 from nowakprojects/automatic-precommit-code-fo…
PiotrRynio Dec 31, 2020
a8cc3d5
Merge branch 'develop' into UI-Komponent-Logo-Star-Wars
MateuszNaKodach Jan 2, 2021
4823ecd
#28 Logika | Zapisywanie rankingu w Local Storage (#50)
annalamperska Jan 3, 2021
b368f41
Merge branch 'develop' into UI-Komponent-Logo-Star-Wars
PiotrRynio Jan 3, 2021
7eb4af8
Merge pull request #46 from nowakprojects/UI-Komponent-Logo-Star-Wars
PiotrRynio Jan 3, 2021
77a6e1f
#47 Delete useless HTML elements structure (#52)
PiotrRynio Jan 3, 2021
f52f11a
#27 Asnwer veryfication
PawelSzambelan Jan 3, 2021
efc6386
#8 Add question generator
jurecki Jan 4, 2021
fcdd2fa
#8 Refactor QuestionGenerator following functional programming princi…
Jan 4, 2021
fcc9392
Revert "#8 Refactor QuestionGenerator following functional programmin…
Jan 4, 2021
21ed9c6
#45 UI | Favicon.ico
PiotrRynio Jan 4, 2021
8507d4a
#11_UI_Komponent_Przycisk_czerwony (#49)
DomiZet Jan 4, 2021
6cec9c0
#8 Refactor QuestionGenerator following functional programming princi…
MateuszNaKodach Jan 5, 2021
081869a
#13 UI komponent przycisk
tomaszdworniczak Jan 5, 2021
b2474d5
#14 Add GameMode component (#55)
DomiZet Jan 8, 2021
b71ffcd
#59 Add common render function, which can be used to render any compo…
Jan 8, 2021
405d888
Common btn (#62)
PiotrRynio Jan 9, 2021
8d38aca
#58 Common Btn
PiotrRynio Jan 10, 2021
3bc8506
Add changeText function in Button component (#64)
PiotrRynio Jan 10, 2021
1952356
Destroy comp function and tests (#63)
PiotrRynio Jan 10, 2021
16f737b
#17 UI Komponent | Odpowiedzi na pytanie (#65)
annalamperska Jan 10, 2021
2e451e6
#32 Computer Mind
PiotrRynio Jan 10, 2021
7cd00af
Quick fix of render function (#68)
tomaszdworniczak Jan 11, 2021
ef5677b
#18 create modal window component (#57)
PawelSzambelan Jan 11, 2021
99ee970
#15 UI Komponent | Zasady gry dla wybranego trybu (#71)
annalamperska Jan 12, 2021
2398275
#19 modal window content (#72)
PawelSzambelan Jan 14, 2021
bfdd339
# 10 UI players ranking for game mode (#78)
tomaszdworniczak Jan 15, 2021
e10f75d
GitHub Actions | Deploy from develop branch
Jan 15, 2021
57fe914
#23 Rendering components in mainContainer ( @PiotrWR & @tomdworniczak…
PiotrRynio Jan 16, 2021
f02a6f5
Unblock Animation (#81)
PiotrRynio Jan 16, 2021
0a26f53
Fix for displaying question image and logo after build
PawelSzambelan Jan 17, 2021
96d8bdf
#22 Developed game quiz view (#82)
PiotrRynio Jan 17, 2021
72a0ca8
Update game quiz view (#84)
PiotrRynio Jan 17, 2021
dcbac85
Quiz view before merge (#86)
PiotrRynio Jan 17, 2021
2780dfb
Quiz timer #21 (#70)
tomaszdworniczak Jan 18, 2021
adc3b5f
Fix for images (#90) change their src
PawelSzambelan Jan 18, 2021
dd0e59d
Fix/ranking sort added (#92)
PawelSzambelan Jan 18, 2021
6527c48
Update view for modal window (#89)
PawelSzambelan Jan 18, 2021
d9430e4
Remove border from main view (#93)
PawelSzambelan Jan 18, 2021
0415347
#73 responsivity from360×640 to 414×896 (#83)
PawelSzambelan Jan 18, 2021
2641279
#74 responsivity from 601px to 1024px (#87)
PawelSzambelan Jan 18, 2021
8a5aceb
#29 Logika | Quiz - przeprowadzenie rozgrywki
annalamperska Jan 18, 2021
fac753f
#74 Update for tablets view
PawelSzambelan Jan 18, 2021
27990fc
#75 Responsiveness for 1280 1920px
tomaszdworniczak Jan 18, 2021
a1265e1
#20 Add lightsaber timer
DomiZet Jan 18, 2021
32dfb2e
Fix for mobiles responsivity (#96)
PawelSzambelan Jan 18, 2021
bc28e37
Fix for times names (#97)
PawelSzambelan Jan 18, 2021
9e79b8d
Fix for styles for 1280-1400px width screen (#98)
tomaszdworniczak Jan 18, 2021
20e4f96
Update README.md
DomiZet Jan 19, 2021
27f6ee1
README | Add presentation graphic
Jan 19, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
build:
name: "Build Star Wars Quiz application"
name: 'Build Star Wars Quiz application'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -28,8 +28,8 @@ jobs:
name: swquiz-dist
path: ./dist
deploy-on-github-pages:
name: "Deploy app to GitHub Pages from main branch source code"
if: github.ref == 'refs/heads/main'
name: 'Deploy app to GitHub Pages from develop branch source code'
if: github.ref == 'refs/heads/develop'
needs: build
runs-on: ubuntu-latest
steps:
Expand All @@ -42,7 +42,7 @@ jobs:
if: ${{ github.event_name != 'pull_request' && always() }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: "./dist"
publish_dir: './dist'
user_name: 'github-actions[bot]'
user_email: 'github-actions[bot]@users.noreply.github.com'
force_orphan: true
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ dist
.cache
node_modules
coverage
css
.history
4 changes: 3 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"singleQuote": true,
"trailingComma": "all"
"trailingComma": "all",
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Super, że był skonfigurowany prettier! Dużo zespołów to pominęło, a to znacznie pomogło we współpracy.

"tabWidth": 2,
"semi": true
}
282 changes: 33 additions & 249 deletions README.md

Large diffs are not rendered by default.

57 changes: 43 additions & 14 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,49 @@
<!DOCTYPE html>
<html lang="pl">
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta http-equiv="X-UA-Compatible" content="ie=edge"/>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>CodersCamp2020 | Star Wars API QUIZ</title>
<link rel="stylesheet" href="styles/App.css"/>
<link rel="stylesheet" href="sass/style.scss" />
<link
href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
rel="stylesheet"
/>
<link
rel="apple-touch-icon"
sizes="180x180"
href="/static/assets/icons/apple-touch-icon.png"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="/static/assets/icons/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="/static/assets/icons/favicon-16x16.png"
/>

<link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
rel="stylesheet">
</head>
<body>
<link
rel="icon"
type="image/png"
sizes="192x192"
href="/static/assets/icons/android-chrome-192x192.png"
/>
<link
rel="icon"
type="image/png"
sizes="512x512"
href="/static/assets/icons/android-chrome-512x512.png"
/>
</head>
<body>
<div id="swquiz-app"></div>

<div id="swquiz-app">
</div>

<script src="src/index.js"></script>
</body>
<script src="src/index.js"></script>
</body>
</html>
Loading