Topic/web #24
Open
Topic/web #24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add basic React files for web client interface.
|
Could you rebase onto development to resolve the merge conflicts? |
liam923
reviewed
Jan 27, 2021
client/web/.eslintcache
Outdated
| @@ -0,0 +1 @@ | |||
| [{"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/index.js":"1","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/serviceWorker.js":"2","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/App.js":"3","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/hoc/Aux/Aux.js":"4","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/hoc/Layout/Layout.js":"5","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/containers/Manager/Manager.js":"6","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/Datum/Datum.js":"7","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/common/Button/Button.js":"8","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/NavigationBar/NavigationBar.js":"9","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/NavigationBar/NavigationItem/NavigationItem.js":"10"},{"size":503,"mtime":1610677110363,"results":"11","hashOfConfig":"12"},{"size":5086,"mtime":1601917748000,"results":"13","hashOfConfig":"12"},{"size":322,"mtime":1610436557208,"results":"14","hashOfConfig":"12"},{"size":59,"mtime":1609902397813,"results":"15","hashOfConfig":"12"},{"size":368,"mtime":1610505540956,"results":"16","hashOfConfig":"12"},{"size":3133,"mtime":1610683491380,"results":"17","hashOfConfig":"12"},{"size":1551,"mtime":1610683228596,"results":"18","hashOfConfig":"12"},{"size":243,"mtime":1610678378083,"results":"19","hashOfConfig":"12"},{"size":1099,"mtime":1610679362673,"results":"20","hashOfConfig":"12"},{"size":1666,"mtime":1610679218588,"results":"21","hashOfConfig":"12"},{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},"ajdv49",{"filePath":"25","messages":"26","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"27","messages":"28","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"29","messages":"30","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"31","messages":"32","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"39"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/index.js",[],["44","45"],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/serviceWorker.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/App.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/hoc/Aux/Aux.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/hoc/Layout/Layout.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/containers/Manager/Manager.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/Datum/Datum.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/common/Button/Button.js",[],["46","47"],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/NavigationBar/NavigationBar.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/NavigationBar/NavigationItem/NavigationItem.js",[],{"ruleId":"48","replacedBy":"49"},{"ruleId":"50","replacedBy":"51"},{"ruleId":"48","replacedBy":"52"},{"ruleId":"50","replacedBy":"53"},"no-native-reassign",["54"],"no-negated-in-lhs",["55"],["54"],["55"],"no-global-assign","no-unsafe-negation"] | |||
There was a problem hiding this comment.
Although it's ignored it needs to be removed from git
Comment on lines
+11
to
+44
| case ('passwords'): | ||
| datum = ( | ||
| <Aux> | ||
| <h4>{props.datum.url}</h4> | ||
| <p>{props.datum.username}</p> | ||
| </Aux> | ||
| ); | ||
| break; | ||
| case ('creditcards'): | ||
| datum = ( | ||
| <Aux> | ||
| <h4>{props.datum.desc}</h4> | ||
| <p>Ending with {props.datum.number.slice(props.datum.number.length - 4)}</p> | ||
| </Aux> | ||
| ); | ||
| break; | ||
| case ('notes'): | ||
| datum = ( | ||
| <Aux> | ||
| <h4>{props.datum.title}</h4> | ||
| </Aux> | ||
| ); | ||
| break; | ||
| case ('codes'): | ||
| datum = ( | ||
| <Aux> | ||
| <h4>{props.datum.desc}</h4> | ||
| <p>{props.datum.type}</p> | ||
| </Aux> | ||
| ); | ||
| break; | ||
| default: | ||
| datum = null; | ||
| break; |
There was a problem hiding this comment.
The code ends up switching over the types of datums in a lot of places. Maybe an enum or some sort of inheritance would be better?
liam923
requested changes
Jan 29, 2021
client/web/.eslintcache
Outdated
| @@ -0,0 +1 @@ | |||
| [{"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/index.js":"1","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/serviceWorker.js":"2","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/App.js":"3","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/hoc/Aux/Aux.js":"4","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/hoc/Layout/Layout.js":"5","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/containers/Manager/Manager.js":"6","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/Datum/Datum.js":"7","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/common/Button/Button.js":"8","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/NavigationBar/NavigationBar.js":"9","/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/NavigationBar/NavigationItem/NavigationItem.js":"10"},{"size":503,"mtime":1610677110363,"results":"11","hashOfConfig":"12"},{"size":5086,"mtime":1601917748000,"results":"13","hashOfConfig":"12"},{"size":322,"mtime":1610436557208,"results":"14","hashOfConfig":"12"},{"size":59,"mtime":1609902397813,"results":"15","hashOfConfig":"12"},{"size":368,"mtime":1610505540956,"results":"16","hashOfConfig":"12"},{"size":3133,"mtime":1610683491380,"results":"17","hashOfConfig":"12"},{"size":1551,"mtime":1610683228596,"results":"18","hashOfConfig":"12"},{"size":243,"mtime":1610678378083,"results":"19","hashOfConfig":"12"},{"size":1099,"mtime":1610679362673,"results":"20","hashOfConfig":"12"},{"size":1666,"mtime":1610679218588,"results":"21","hashOfConfig":"12"},{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},"ajdv49",{"filePath":"25","messages":"26","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"27","messages":"28","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"29","messages":"30","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"31","messages":"32","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"39"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/index.js",[],["44","45"],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/serviceWorker.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/App.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/hoc/Aux/Aux.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/hoc/Layout/Layout.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/containers/Manager/Manager.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/Datum/Datum.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/common/Button/Button.js",[],["46","47"],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/NavigationBar/NavigationBar.js",[],"/Users/jaimekvaternik/Documents/projects/software/Kript/client/web/src/components/NavigationBar/NavigationItem/NavigationItem.js",[],{"ruleId":"48","replacedBy":"49"},{"ruleId":"50","replacedBy":"51"},{"ruleId":"48","replacedBy":"52"},{"ruleId":"50","replacedBy":"53"},"no-native-reassign",["54"],"no-negated-in-lhs",["55"],["54"],["55"],"no-global-assign","no-unsafe-negation"] | |||
There was a problem hiding this comment.
Although it's ignored it needs to be removed from git
Increase cloudbuild timeout from 10 to 20 minutes.
|
Can you rebase to resolve the conflicts and then squash? Once that's done it's ready to merge |
|
Yeah, let me finish my hw and I'll do it |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Topic/web - Feat: Add home React files to Development