diff --git a/src/components/feedbackArea.js b/src/components/feedbackArea.js index 32cc696..9cb6bc8 100644 --- a/src/components/feedbackArea.js +++ b/src/components/feedbackArea.js @@ -44,7 +44,7 @@ export default function FeedbackArea({ from }) { placeholder={'Ide kezdhetsz el írni...'} onChange={(event) => setFeedback(event.target.value)} value={feedback} - className={styles.feedback} + className={styles.contactFeedback} />
diff --git a/src/components/feedbackArea.module.css b/src/components/feedbackArea.module.css index 16f2645..2a45c2e 100644 --- a/src/components/feedbackArea.module.css +++ b/src/components/feedbackArea.module.css @@ -1,10 +1,10 @@ -.feedback { +.contactFeedback { color: var(--text-color); background-color: var(--background-color); font-size: 14px; - width: 60% !important; + width: 600px; box-sizing: border-box; - height: 100px; + height: 150px; resize: none; margin-top: 15px; padding: 5px; diff --git a/src/components/todoStuff/todo.module.css b/src/components/todoStuff/todo.module.css index 79f61a5..056c723 100644 --- a/src/components/todoStuff/todo.module.css +++ b/src/components/todoStuff/todo.module.css @@ -3,20 +3,7 @@ padding: 4px; } -.groupContainer { - display: flex; -} - -.group { - padding: 8px 16px; - cursor: pointer; - user-select: none; -} - -.group:hover { - background-color: #333; -} - -.selectedGroup { - background-color: #444; +.todoButtons { + height: 38px; + text-wrap: normal; } diff --git a/src/components/todoStuff/todoBoard.module.css b/src/components/todoStuff/todoBoard.module.css index 7e603fa..5b4d0d4 100644 --- a/src/components/todoStuff/todoBoard.module.css +++ b/src/components/todoStuff/todoBoard.module.css @@ -11,6 +11,7 @@ .categoryName { text-align: center; + margin-top: 85px !important; margin: 5px 0px; font-size: 16px; font-weight: bold; diff --git a/src/components/todoStuff/todoCard.js b/src/components/todoStuff/todoCard.js index 8c36d1d..3f44fb9 100644 --- a/src/components/todoStuff/todoCard.js +++ b/src/components/todoStuff/todoCard.js @@ -11,7 +11,7 @@ export default function TodoCard(props) {
{ onClick(props.cardData) @@ -27,7 +27,7 @@ export default function TodoCard(props) { backgroundColor: categories[category].color, color: 'white', borderRadius: '2px', - padding: '2px 4px', + padding: '3px', }} > {categories[category].name} @@ -35,9 +35,9 @@ export default function TodoCard(props) {
-
{`Votes: ${votes.length}`}
+
{`Szavazatok: ${votes.length}`}
-
{points}
+
{`Neh�zs�g: ${points}`}
) diff --git a/src/components/todoStuff/todoCard.module.css b/src/components/todoStuff/todoCard.module.css index c015768..73271cc 100644 --- a/src/components/todoStuff/todoCard.module.css +++ b/src/components/todoStuff/todoCard.module.css @@ -1,12 +1,14 @@ .card { - border-radius: 2px; - padding: 5px; - margin: 6px 3px; + border-radius: 5px; + padding: 7px; + margin: 8px 4px; cursor: pointer; + background-color: #171616; } .voted { - color: #cf9; + color: var(--text-color); + font-weight: 600; } .card:hover { @@ -15,7 +17,7 @@ } .card > div { - margin: 5px 0px; + margin: 6px 4px; } .description { @@ -25,7 +27,7 @@ } .category { - font-size: 10px; + font-size: 12px; white-space: nowrap; } @@ -39,6 +41,6 @@ } .id { - margin: 0px 3px; + margin: 1px 6px 1px 1px; color: #999; } diff --git a/src/components/todoStuff/todoRow.js b/src/components/todoStuff/todoRow.js index 13ad19a..9fbc77c 100644 --- a/src/components/todoStuff/todoRow.js +++ b/src/components/todoStuff/todoRow.js @@ -14,7 +14,7 @@ export default function TodoRow(props) { }} className={styles.row} style={{ - border: `2px solid ${group || '#99f'}`, + border: `2px dashed ${categories[category].color || 'white'}`, }} >
{`#${id}`}
@@ -23,11 +23,11 @@ export default function TodoRow(props) {
{categories[category].name} @@ -35,7 +35,7 @@ export default function TodoRow(props) {
{`Votes: ${votes.length}`}
+ >{`Szavazatok: ${votes.length}`} ) } diff --git a/src/components/todoStuff/todoRow.module.css b/src/components/todoStuff/todoRow.module.css index 1e8c573..472b6c8 100644 --- a/src/components/todoStuff/todoRow.module.css +++ b/src/components/todoStuff/todoRow.module.css @@ -1,10 +1,9 @@ .row { - display: flex; - border: 2px solid #99f; - border-radius: 2px; - padding: 5px; - margin: 6px 3px; + border-radius: 5px; + padding: 7px; + margin: 8px 4px; cursor: pointer; + background-color: #171616; } .row:hover { @@ -13,12 +12,12 @@ } .row > div { - margin: 0px 5px; + margin: 6px 4px; } .id { flex: 0 20px; - margin: 0px 3px; + margin: 1px 6px 1px 1px; color: #999; } @@ -30,10 +29,14 @@ } .votes { + display: flex; + justify-content: space-between; + font-size: 12px; } .voted { - color: #cf9; + color: var(--text-color); + font-weight: 600; } .catName { diff --git a/src/components/todoStuff/todoSidebar.js b/src/components/todoStuff/todoSidebar.js index 185087b..3afbeca 100644 --- a/src/components/todoStuff/todoSidebar.js +++ b/src/components/todoStuff/todoSidebar.js @@ -27,16 +27,16 @@ export default function Todos({
#{id} -
{name}
+
+ {name} +
{categories[category].name} @@ -45,7 +45,7 @@ export default function Todos({
{group && (
-
Csoport:
+
Csoport:
{namedGroups[group] ? namedGroups[group].name : group}
@@ -64,16 +64,25 @@ export default function Todos({
{votes.length}
{gitlink && ( -
- - Git link - -
+
+ +
)}
{description && ( <> -
Leírás
+
+ Leírás +
)} -
+
{voteable && ( -
{ - voteOn(card) - }} - > - {votes.includes(userId) ? 'Szavazat visszavonása' : 'Szavazás'} -
+
+
+
{ + voteOn(card) + }} + > + {votes.includes(userId) ? 'Szavazat visszavonása' : 'Szavazás'} +
+
+
)}
) diff --git a/src/components/todoStuff/todoSidebar.module.css b/src/components/todoStuff/todoSidebar.module.css index 7846e70..194bc21 100644 --- a/src/components/todoStuff/todoSidebar.module.css +++ b/src/components/todoStuff/todoSidebar.module.css @@ -28,14 +28,14 @@ } .id { - font-size: 16px; + font-size: 20px; margin: 0px 3px; color: #999; } .description { - overflow-x: hidden; - overflow-y: scroll; + overflow-x: auto; + overflow-y: auto; max-height: calc(38vh); margin: 5px; } @@ -43,6 +43,7 @@ .row { display: flex; justify-content: space-between; + margin: 2px 10px; } .button { diff --git a/src/components/todoStuff/todoTable.module.css b/src/components/todoStuff/todoTable.module.css index 524aeeb..58fbb06 100644 --- a/src/components/todoStuff/todoTable.module.css +++ b/src/components/todoStuff/todoTable.module.css @@ -11,6 +11,8 @@ .container { flex-direction: column; + margin-top: 30px; + margin-bottom: 50px; } .title { diff --git a/src/components/todoStuff/todos.js b/src/components/todoStuff/todos.js index 4bc555a..8f04bc6 100644 --- a/src/components/todoStuff/todos.js +++ b/src/components/todoStuff/todos.js @@ -95,13 +95,14 @@ export default function Todos() { const sg = namedGroups[selectedGroup] return ( <> -
+
{groups.map((group) => { const namedGroup = namedGroups[group] return (
{ setSelectedGroup(group) @@ -112,8 +113,9 @@ export default function Todos() { ) })}
{ setSelectedGroup('uncat') }} @@ -121,7 +123,8 @@ export default function Todos() { {'Kategorizálatlan'}
{ setSelectedGroup(null) }} diff --git a/src/constants.json b/src/constants.json index 8650745..2e8bdb3 100644 --- a/src/constants.json +++ b/src/constants.json @@ -1,6 +1,6 @@ { "siteUrl": "https://qmining.frylabs.net/", - "apiUrl": "https://api.frylabs.net/", + "apiUrl": "https://qmining.frylabs.net/", "mobileWindowWidth": 700, "maxQuestionsToRender": 250 } diff --git a/src/defaultStyles.css b/src/defaultStyles.css index 9e702d5..2c27fc1 100644 --- a/src/defaultStyles.css +++ b/src/defaultStyles.css @@ -381,7 +381,7 @@ input:focus { background-color: var(--hoover-color); border: none; color: var(--text-color); - padding: 5px 10px; + padding: 5px 15px; font-weight: bold; font-size: 15px; margin: 8px 5px 2px 5px; diff --git a/src/pages/contact.js b/src/pages/contact.js index e36c2bf..672b6a0 100644 --- a/src/pages/contact.js +++ b/src/pages/contact.js @@ -43,8 +43,8 @@ export default function Contact() {
Üzenet küldése
- Weboldalon keresztüli üzenetküldés az adminnak (feedback). Válasz bal - alsó levelesládába (📬) érkezik majd. + Weboldalon keresztüli üzenetküldés az adminnak (feedback). A válasz a + bal alsó postaládába (📬 ikon) fog érkezni.
diff --git a/src/pages/contribute.js b/src/pages/contribute.js index 155be01..f4e46a5 100644 --- a/src/pages/contribute.js +++ b/src/pages/contribute.js @@ -14,7 +14,7 @@ export default function contribute() { const [showFeedback, setShowFeedback] = useState(false) return ( -
+
Todos - Qmining | Frylabs.net @@ -29,8 +29,8 @@ export default function contribute() {

Emellet ha hozzáértő vagy, adott feladatok megvalósításában is - segíthetsz. (lásd: lentebb) -
Ha egy kártyára kattintasz, a megjelenő abalkban láthatod annak + segíthetsz. (lásd: lentebb) +
Ha egy kártyára kattintasz, a megjelenő ablakban láthatod annak részleteit, illetve{' '} szavazhatsz @@ -54,29 +54,39 @@ export default function contribute() {

+


-
Git repos
-
-
-
+
+ Git repos +
+
{Object.keys(repos.repos).map((key) => { let repo = repos.repos[key] return ( - - {repo.description} - +
+ +
) })} -
-
+
+
{showFeedback && ( { diff --git a/src/pages/contribute.module.css b/src/pages/contribute.module.css index 0cbe79e..a85b170 100644 --- a/src/pages/contribute.module.css +++ b/src/pages/contribute.module.css @@ -11,10 +11,22 @@ text-align: center; } +.repos { + margin-top: 6%; + margin-left: 10%; +} + .repos a { margin: 0px 5px; + text-decoration: none; } .newTaskButton { - width: 40%; + width: 25%; +} + +.imgContainer { + float: right; + text-align: right; + padding-right: 50px; }