-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
Migrate intelv2 aa1 to implement 2 #132
Open
pinterid
wants to merge
192
commits into
implement-2
Choose a base branch
from
migrate-intelv2-aa1
base: implement-2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 184 commits
Commits
Show all changes
192 commits
Select commit
Hold shift + click to select a range
b7bdb5e
Add new intel and client
Aichnerc 8abce19
Add new register
Aichnerc c8ac122
Improve register
Aichnerc 57b35dc
Remove all actions and implement user actions
schettn 152b01c
Adjust components to work with new user actions
schettn d0f7cfc
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn 6056351
Comment out a bit
schettn d6f8612
Add person get action
schettn 794b9f0
Rename import path for logout action
schettn 31a08a6
Update profile page
schettn f49cfa4
Fix wrong dispatches in person action
schettn 6b6eb5c
Fix modals
Aichnerc 953de6a
Add ConnectModal
Aichnerc 24118e2
Improve ConnectModal
Aichnerc 5e21ca1
Update search functionallity
schettn 76976c1
Add general reducers
schettn cc25e35
Improve ConnectModal
Aichnerc 7abb34e
Improve store
schettn 35b034a
Improve general actions
schettn 015de2d
Fix naming issue
schettn 9884a7f
Unyeet registration
Aichnerc f90b97c
Add registration action
schettn 9231ecc
Move person actions to general action
schettn 78bd83c
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn aec4641
Add some more actions and reducers
schettn 1d20820
Add enterprise actions and reducers
schettn f176062
Add achievement redeem action and reducer
schettn b32b200
Fix typo in store types
schettn b930d18
Add missing register export
schettn 31c0bf1
Add valid username check
schettn 1b42c34
Add talk actions and reducers
schettn c986125
Adjust component name, location and adjust for new data structure
schettn 534afca
Improve talks and some more improvements
schettn 8732bfc
Improve setting page
schettn 08ca002
Fix navbar avatar image
schettn c7bfad3
Add optional changing for logged user
schettn 9e74c28
Fix logout navbar issue
schettn 5809a79
Improve talks tab
schettn bd15e79
Optimise settings handle change
schettn cbaea79
Add support for uploading a avatar image
schettn b46c5fc
Fix talk tab iframe rendering error
schettn d2defde
Improve setting change check
schettn 3081b0c
Set loggedusers person after updating settings
schettn ee946c2
Merge branch 'update-component-structure-aa1' into migrate-intelv2-aa1
schettn c24cac0
Merge branch 'implement-2' into migrate-intelv2-aa1
schettn 59f7da5
Improve company page data
schettn 9498abd
Optimise registration and login
schettn ebaca64
Improve loading of person page
schettn 71108da
Change achievements to achievement
schettn 90a998b
Add profiles to settings
schettn 114248b
Update project and projects tab
schettn 8efdf27
Add profile processing in person page
schettn 43016e0
Remove legacy code and console logs
schettn ecc8366
Fix project owner name
schettn 9f01ae3
Fix info card languages
schettn 3c7cac3
Integrate overview tab and calendar 3d
schettn 8a432a3
Integrate calendar2d, contrib radar and latest activity chart
schettn 50a41ac
Add to continue style
pinterid 13a8810
Add to continue modal
pinterid 2c9ce53
Update exports
pinterid a0a8faf
Add follow styles
pinterid 5a69d53
Add follow modal
pinterid 3b2db86
Update exports
pinterid f4a5750
Import modals
pinterid 40607b4
Import actions
pinterid ad9169a
Update redux mapping
pinterid 9b790a9
Update imports
pinterid 187625b
Update state
pinterid 598ba9a
Add follow function
pinterid 21aa9c8
Add unfollow function
pinterid c81aa9d
Add follow check function
pinterid 9b349df
Add component function
pinterid 919e8fe
Add modal handle function
pinterid 64c5863
Implement modals
pinterid 9451df2
Implement follow
pinterid 7541516
Fix settings bug
pinterid 87780e6
Integrate movable pool
schettn d812dc3
Merge branch 'add-follow-aa1' into migrate-intelv2-aa1
pinterid 14aaf97
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
pinterid 4037b66
Only render charts if statistics data is present
schettn 3429454
Hide diagram labels if diagrams are not visible
schettn 02a2e93
Add more settings
schettn f9e738a
First attempt to fix company page
schettn 61e3739
Fix person actions
pinterid e054255
Update follow modal
pinterid eab378f
Add likes modal styles
pinterid 3868b49
Add likes modal
pinterid f80322d
Update exports
pinterid fc1a2aa
Update imports
pinterid b9ac3f0
Implement likes modal
pinterid 0ce1b68
Update redux mapping
pinterid a3a65cf
Add like function
pinterid 9c21c5d
Add unlike function
pinterid 096631e
Add like checker
pinterid e3fdb1b
Implement like component
pinterid 05f882b
Merge branch 'add-like-aa1' into migrate-intelv2-aa1
pinterid 174e941
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
pinterid f996843
Update sign out
pinterid f485820
Fix link ussues
pinterid 32c924b
Improve settings menu
Aichnerc 0ea8c89
Improve settings profile picture selector
Aichnerc c0d1045
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn a0c8d77
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn 7306398
Fix invalid login issue
schettn 0b4e96d
Improve company page
Aichnerc aebe9e5
Improve enterprise project modal
Aichnerc 2d25295
Fix fetching users
Aichnerc 9b9a77c
Improve user modal
Aichnerc 4609f0a
Add code statistics to enterprise overview
Aichnerc 57b194e
Add imprint
Aichnerc be6318a
Improve overview page
Aichnerc e17f983
Improve company page
Aichnerc a8842b5
Add fake data for enterprise users
schettn 00fc1f3
Add dynamic avatar image to company page
schettn ff7d7c7
Improve instagram posts action
schettn 6b8eebb
Fix projects
Aichnerc f58a1c4
Remove duplicate status on person page
schettn faee546
Improve calendars
schettn efe471d
Reverse the reversing
schettn 6d450e4
Implement connections
Aichnerc ef11eb8
Add connect modal styling
Aichnerc 91a392a
Implement gitlab
Aichnerc c2547a5
Improve gitlab modal
Aichnerc f3db888
Improve profile processing
schettn ffb878f
Implement media sections functionality
Aichnerc f9c9720
Implement video and song gallery
Aichnerc 828ff1e
Improve instagram selection
Aichnerc dbfa65f
Hide media section buttons for diff origin users
Aichnerc 4df45e1
Rework editing system
Aichnerc d5559a8
Improve Instagram selection
Aichnerc 4bbd805
Improve image selector
Aichnerc db658f1
Improve YouTube adding
Aichnerc 9fab6c2
Improve upload modal
Aichnerc a348b2d
Improve upload modal
Aichnerc 9367053
Implement video removal
Aichnerc 488ccec
Improve upload modal
schettn 39852ed
Improve video removal
Aichnerc 93c6254
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn 7f8682d
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn fe9e09c
Implement song removal
Aichnerc b1a4c91
Remove unused import form upload modal
schettn 7fdecf8
Improve import of talks tab
schettn b3deca0
Add custom image upload
schettn a50499b
Improve image galleries
Aichnerc 11beab3
Implement image upload
Aichnerc 09ca65b
Implement picture removal
Aichnerc 9f6fffc
Implement connect modal
Aichnerc bad0db1
Improve connect modal
Aichnerc 4dd14ed
Add basic load more instagram posts functionality
schettn e0eec2f
Fix state setting on load more
schettn 3bee60b
Fix connect modal
Aichnerc 31b1170
Improve code quality
Aichnerc 467e664
Improve remove custom image function
schettn a5dc889
Add achievement component
pinterid e77de5a
Update exports
pinterid 2963242
Improve code quality
pinterid a46b1d2
Add achievement tabs styles
pinterid 408f781
Add achievement tab
pinterid c2095a5
Update exports
pinterid 163e537
Implement achievements tab
pinterid 9754c74
Update .env.template
pinterid edb2782
Add path explorer
pinterid 47b60df
Add inspector
pinterid 805db14
Add console user
pinterid 21b291d
Fix image modal
Aichnerc 5f2075a
Fix settings
Aichnerc aa11b53
Add photo map
pinterid 6fd5bd2
Implement photo maps
pinterid 9beaf20
Apply setting state error fix for all settings
schettn 5bd27fa
Implement instagram image selector
Aichnerc c45af63
Update photo map
pinterid ae5b637
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
pinterid 2d5ffd7
Add display map setting
schettn 1928191
Add user check
pinterid 1870137
Fix connect modal
Aichnerc 84ee0cf
Fix talks page and add comment functionallity
schettn 13ba2c0
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn e578b48
Update action
pinterid 59cfc98
Update achievement tab
pinterid dfc9c6e
Merge branch 'add-achievements-aa1' into migrate-intelv2-aa1
pinterid 3a26088
Add select image conditional rendering
schettn 4a82af9
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn d07ba0f
Switch to production engine
schettn ab79e43
Update dependencies
schettn 36338ac
Improve code quality
pinterid 55c10d9
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
pinterid c694880
Remove temp page
schettn acb5224
Remove unused code in ContribRadar
schettn 57d4538
Enhance FollowModal performence
schettn 2bdcab0
Improve person page refreshing
schettn be22850
Refresh infocard when modal closes
schettn b048047
Remove console logs
schettn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,8 @@ | ||
REACT_APP_ANONYMOUS_USER=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | ||
REACT_APP_VERSION=$npm_package_version | ||
REACT_APP_VERSION=$npm_package_version | ||
FLAG_CONSOLE_USER=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | ||
FLAG_BOOKWORM=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | ||
FLAG_FAKER=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | ||
FLAG_PATH_EXPLORER=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | ||
FLAG_REAL_GAMER=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | ||
FLAG_INSPECTOR=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
//#region > Imports | ||
//> React | ||
// Contains all the functionality necessary to define React components | ||
import React from "react"; | ||
// Runtime type checking for React props and similar objects | ||
import PropTypes from "prop-types"; | ||
//> MDB | ||
// "Material Design for Bootstrap" is a great UI design framework | ||
import { | ||
MDBCol, | ||
MDBIcon, | ||
MDBRow, | ||
MDBPopover, | ||
MDBPopoverHeader, | ||
MDBPopoverBody, | ||
} from "mdbreact"; | ||
//#endregion | ||
|
||
//#region > Components | ||
/** @class A component to display an achievement */ | ||
class Achievement extends React.Component { | ||
state = { | ||
isVisible: false, | ||
}; | ||
|
||
togglePopover = () => { | ||
this.setState({ | ||
isVisible: !this.state.isVisible, | ||
}); | ||
}; | ||
|
||
render() { | ||
const { achievement } = this.props; | ||
|
||
return ( | ||
<MDBCol | ||
md="6" | ||
onMouseEnter={() => { | ||
this.togglePopover(); | ||
}} | ||
onMouseLeave={() => { | ||
this.togglePopover(); | ||
}} | ||
> | ||
<MDBPopover | ||
popover | ||
placement="top" | ||
domElement | ||
isVisible={this.state.isVisible} | ||
> | ||
<li> | ||
<MDBRow> | ||
<MDBCol md="6"> | ||
<img src={achievement?.image?.src} /> | ||
</MDBCol> | ||
<MDBCol md="4"> | ||
<MDBRow> | ||
<strong>{achievement.title}</strong> | ||
</MDBRow> | ||
<MDBRow>X days ago </MDBRow> | ||
</MDBCol> | ||
</MDBRow> | ||
</li> | ||
<div> | ||
<MDBPopoverHeader>{achievement.title}</MDBPopoverHeader> | ||
<MDBPopoverBody>{achievement.description}</MDBPopoverBody> | ||
</div> | ||
</MDBPopover> | ||
</MDBCol> | ||
); | ||
} | ||
} | ||
//#endregion | ||
|
||
//#region > Exports | ||
//> Default Component | ||
export default Achievement; | ||
//#endregion | ||
|
||
/** | ||
* SPDX-License-Identifier: (EUPL-1.2) | ||
* Copyright © 2019-2020 Simon Prast | ||
*/ |
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All "Temp" component should be removed.