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.

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
wants to merge 192 commits into
base: implement-2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
192 commits
Select commit Hold shift + click to select a range
b7bdb5e
Add new intel and client
Aichnerc Sep 7, 2020
8abce19
Add new register
Aichnerc Sep 7, 2020
c8ac122
Improve register
Aichnerc Sep 7, 2020
57b35dc
Remove all actions and implement user actions
schettn Sep 7, 2020
152b01c
Adjust components to work with new user actions
schettn Sep 7, 2020
d0f7cfc
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn Sep 7, 2020
6056351
Comment out a bit
schettn Sep 7, 2020
d6f8612
Add person get action
schettn Sep 7, 2020
794b9f0
Rename import path for logout action
schettn Sep 7, 2020
31a08a6
Update profile page
schettn Sep 7, 2020
f49cfa4
Fix wrong dispatches in person action
schettn Sep 7, 2020
6b6eb5c
Fix modals
Aichnerc Sep 7, 2020
953de6a
Add ConnectModal
Aichnerc Sep 7, 2020
24118e2
Improve ConnectModal
Aichnerc Sep 7, 2020
5e21ca1
Update search functionallity
schettn Sep 7, 2020
76976c1
Add general reducers
schettn Sep 7, 2020
cc25e35
Improve ConnectModal
Aichnerc Sep 7, 2020
7abb34e
Improve store
schettn Sep 7, 2020
35b034a
Improve general actions
schettn Sep 7, 2020
015de2d
Fix naming issue
schettn Sep 7, 2020
9884a7f
Unyeet registration
Aichnerc Sep 7, 2020
f90b97c
Add registration action
schettn Sep 7, 2020
9231ecc
Move person actions to general action
schettn Sep 7, 2020
78bd83c
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn Sep 7, 2020
aec4641
Add some more actions and reducers
schettn Sep 8, 2020
1d20820
Add enterprise actions and reducers
schettn Sep 8, 2020
f176062
Add achievement redeem action and reducer
schettn Sep 8, 2020
b32b200
Fix typo in store types
schettn Sep 8, 2020
b930d18
Add missing register export
schettn Sep 8, 2020
31c0bf1
Add valid username check
schettn Sep 8, 2020
1b42c34
Add talk actions and reducers
schettn Sep 8, 2020
c986125
Adjust component name, location and adjust for new data structure
schettn Sep 9, 2020
534afca
Improve talks and some more improvements
schettn Sep 9, 2020
8732bfc
Improve setting page
schettn Sep 9, 2020
08ca002
Fix navbar avatar image
schettn Sep 9, 2020
c7bfad3
Add optional changing for logged user
schettn Sep 9, 2020
9e74c28
Fix logout navbar issue
schettn Sep 9, 2020
5809a79
Improve talks tab
schettn Sep 9, 2020
bd15e79
Optimise settings handle change
schettn Sep 10, 2020
cbaea79
Add support for uploading a avatar image
schettn Sep 10, 2020
b46c5fc
Fix talk tab iframe rendering error
schettn Sep 10, 2020
d2defde
Improve setting change check
schettn Sep 10, 2020
3081b0c
Set loggedusers person after updating settings
schettn Sep 10, 2020
ee946c2
Merge branch 'update-component-structure-aa1' into migrate-intelv2-aa1
schettn Sep 10, 2020
c24cac0
Merge branch 'implement-2' into migrate-intelv2-aa1
schettn Sep 10, 2020
59f7da5
Improve company page data
schettn Sep 10, 2020
9498abd
Optimise registration and login
schettn Sep 10, 2020
ebaca64
Improve loading of person page
schettn Sep 10, 2020
71108da
Change achievements to achievement
schettn Sep 10, 2020
90a998b
Add profiles to settings
schettn Sep 10, 2020
114248b
Update project and projects tab
schettn Sep 10, 2020
8efdf27
Add profile processing in person page
schettn Sep 10, 2020
43016e0
Remove legacy code and console logs
schettn Sep 10, 2020
ecc8366
Fix project owner name
schettn Sep 10, 2020
9f01ae3
Fix info card languages
schettn Sep 10, 2020
3c7cac3
Integrate overview tab and calendar 3d
schettn Sep 10, 2020
8a432a3
Integrate calendar2d, contrib radar and latest activity chart
schettn Sep 10, 2020
50a41ac
Add to continue style
pinterid Sep 10, 2020
13a8810
Add to continue modal
pinterid Sep 10, 2020
2c9ce53
Update exports
pinterid Sep 10, 2020
a0a8faf
Add follow styles
pinterid Sep 10, 2020
5a69d53
Add follow modal
pinterid Sep 10, 2020
3b2db86
Update exports
pinterid Sep 10, 2020
f4a5750
Import modals
pinterid Sep 10, 2020
40607b4
Import actions
pinterid Sep 10, 2020
ad9169a
Update redux mapping
pinterid Sep 10, 2020
9b790a9
Update imports
pinterid Sep 10, 2020
187625b
Update state
pinterid Sep 10, 2020
598ba9a
Add follow function
pinterid Sep 10, 2020
21aa9c8
Add unfollow function
pinterid Sep 10, 2020
c81aa9d
Add follow check function
pinterid Sep 10, 2020
9b349df
Add component function
pinterid Sep 10, 2020
919e8fe
Add modal handle function
pinterid Sep 10, 2020
64c5863
Implement modals
pinterid Sep 10, 2020
9451df2
Implement follow
pinterid Sep 10, 2020
7541516
Fix settings bug
pinterid Sep 10, 2020
87780e6
Integrate movable pool
schettn Sep 10, 2020
d812dc3
Merge branch 'add-follow-aa1' into migrate-intelv2-aa1
pinterid Sep 10, 2020
14aaf97
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
pinterid Sep 10, 2020
4037b66
Only render charts if statistics data is present
schettn Sep 10, 2020
3429454
Hide diagram labels if diagrams are not visible
schettn Sep 10, 2020
02a2e93
Add more settings
schettn Sep 11, 2020
f9e738a
First attempt to fix company page
schettn Sep 11, 2020
61e3739
Fix person actions
pinterid Sep 11, 2020
e054255
Update follow modal
pinterid Sep 11, 2020
eab378f
Add likes modal styles
pinterid Sep 11, 2020
3868b49
Add likes modal
pinterid Sep 11, 2020
f80322d
Update exports
pinterid Sep 11, 2020
fc1a2aa
Update imports
pinterid Sep 11, 2020
b9ac3f0
Implement likes modal
pinterid Sep 11, 2020
0ce1b68
Update redux mapping
pinterid Sep 11, 2020
a3a65cf
Add like function
pinterid Sep 11, 2020
9c21c5d
Add unlike function
pinterid Sep 11, 2020
096631e
Add like checker
pinterid Sep 11, 2020
e3fdb1b
Implement like component
pinterid Sep 11, 2020
05f882b
Merge branch 'add-like-aa1' into migrate-intelv2-aa1
pinterid Sep 11, 2020
174e941
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
pinterid Sep 11, 2020
f996843
Update sign out
pinterid Sep 11, 2020
f485820
Fix link ussues
pinterid Sep 11, 2020
32c924b
Improve settings menu
Aichnerc Sep 11, 2020
0ea8c89
Improve settings profile picture selector
Aichnerc Sep 11, 2020
c0d1045
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn Sep 11, 2020
a0c8d77
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn Sep 11, 2020
7306398
Fix invalid login issue
schettn Sep 11, 2020
0b4e96d
Improve company page
Aichnerc Sep 11, 2020
aebe9e5
Improve enterprise project modal
Aichnerc Sep 11, 2020
2d25295
Fix fetching users
Aichnerc Sep 11, 2020
9b9a77c
Improve user modal
Aichnerc Sep 11, 2020
4609f0a
Add code statistics to enterprise overview
Aichnerc Sep 11, 2020
57b194e
Add imprint
Aichnerc Sep 11, 2020
be6318a
Improve overview page
Aichnerc Sep 11, 2020
e17f983
Improve company page
Aichnerc Sep 11, 2020
a8842b5
Add fake data for enterprise users
schettn Sep 11, 2020
00fc1f3
Add dynamic avatar image to company page
schettn Sep 12, 2020
ff7d7c7
Improve instagram posts action
schettn Sep 12, 2020
6b8eebb
Fix projects
Aichnerc Sep 12, 2020
f58a1c4
Remove duplicate status on person page
schettn Sep 12, 2020
faee546
Improve calendars
schettn Sep 12, 2020
efe471d
Reverse the reversing
schettn Sep 12, 2020
6d450e4
Implement connections
Aichnerc Sep 12, 2020
ef11eb8
Add connect modal styling
Aichnerc Sep 12, 2020
91a392a
Implement gitlab
Aichnerc Sep 12, 2020
c2547a5
Improve gitlab modal
Aichnerc Sep 12, 2020
f3db888
Improve profile processing
schettn Sep 12, 2020
ffb878f
Implement media sections functionality
Aichnerc Sep 13, 2020
f9c9720
Implement video and song gallery
Aichnerc Sep 13, 2020
828ff1e
Improve instagram selection
Aichnerc Sep 13, 2020
dbfa65f
Hide media section buttons for diff origin users
Aichnerc Sep 13, 2020
4df45e1
Rework editing system
Aichnerc Sep 13, 2020
d5559a8
Improve Instagram selection
Aichnerc Sep 13, 2020
4bbd805
Improve image selector
Aichnerc Sep 13, 2020
db658f1
Improve YouTube adding
Aichnerc Sep 13, 2020
9fab6c2
Improve upload modal
Aichnerc Sep 13, 2020
a348b2d
Improve upload modal
Aichnerc Sep 13, 2020
9367053
Implement video removal
Aichnerc Sep 13, 2020
488ccec
Improve upload modal
schettn Sep 13, 2020
39852ed
Improve video removal
Aichnerc Sep 13, 2020
93c6254
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn Sep 13, 2020
7f8682d
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn Sep 13, 2020
fe9e09c
Implement song removal
Aichnerc Sep 13, 2020
b1a4c91
Remove unused import form upload modal
schettn Sep 13, 2020
7fdecf8
Improve import of talks tab
schettn Sep 13, 2020
b3deca0
Add custom image upload
schettn Sep 13, 2020
a50499b
Improve image galleries
Aichnerc Sep 13, 2020
11beab3
Implement image upload
Aichnerc Sep 13, 2020
09ca65b
Implement picture removal
Aichnerc Sep 13, 2020
9f6fffc
Implement connect modal
Aichnerc Sep 13, 2020
bad0db1
Improve connect modal
Aichnerc Sep 13, 2020
4dd14ed
Add basic load more instagram posts functionality
schettn Sep 13, 2020
e0eec2f
Fix state setting on load more
schettn Sep 13, 2020
3bee60b
Fix connect modal
Aichnerc Sep 13, 2020
31b1170
Improve code quality
Aichnerc Sep 13, 2020
467e664
Improve remove custom image function
schettn Sep 13, 2020
a5dc889
Add achievement component
pinterid Sep 14, 2020
e77de5a
Update exports
pinterid Sep 14, 2020
2963242
Improve code quality
pinterid Sep 14, 2020
a46b1d2
Add achievement tabs styles
pinterid Sep 14, 2020
408f781
Add achievement tab
pinterid Sep 14, 2020
c2095a5
Update exports
pinterid Sep 14, 2020
163e537
Implement achievements tab
pinterid Sep 14, 2020
9754c74
Update .env.template
pinterid Sep 14, 2020
edb2782
Add path explorer
pinterid Sep 14, 2020
47b60df
Add inspector
pinterid Sep 14, 2020
805db14
Add console user
pinterid Sep 14, 2020
21b291d
Fix image modal
Aichnerc Sep 14, 2020
5f2075a
Fix settings
Aichnerc Sep 14, 2020
aa11b53
Add photo map
pinterid Sep 14, 2020
6fd5bd2
Implement photo maps
pinterid Sep 14, 2020
9beaf20
Apply setting state error fix for all settings
schettn Sep 14, 2020
5bd27fa
Implement instagram image selector
Aichnerc Sep 14, 2020
c45af63
Update photo map
pinterid Sep 14, 2020
ae5b637
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
pinterid Sep 14, 2020
2d5ffd7
Add display map setting
schettn Sep 14, 2020
1928191
Add user check
pinterid Sep 14, 2020
1870137
Fix connect modal
Aichnerc Sep 14, 2020
84ee0cf
Fix talks page and add comment functionallity
schettn Sep 14, 2020
13ba2c0
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn Sep 14, 2020
e578b48
Update action
pinterid Sep 14, 2020
59cfc98
Update achievement tab
pinterid Sep 14, 2020
dfc9c6e
Merge branch 'add-achievements-aa1' into migrate-intelv2-aa1
pinterid Sep 14, 2020
3a26088
Add select image conditional rendering
schettn Sep 14, 2020
4a82af9
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
schettn Sep 14, 2020
d07ba0f
Switch to production engine
schettn Oct 28, 2020
ab79e43
Update dependencies
schettn Oct 28, 2020
36338ac
Improve code quality
pinterid Nov 10, 2020
55c10d9
Merge remote-tracking branch 'origin/migrate-intelv2-aa1' into migrat…
pinterid Nov 10, 2020
c694880
Remove temp page
schettn Nov 10, 2020
acb5224
Remove unused code in ContribRadar
schettn Nov 10, 2020
57d4538
Enhance FollowModal performence
schettn Nov 10, 2020
2bdcab0
Improve person page refreshing
schettn Nov 11, 2020
be22850
Refresh infocard when modal closes
schettn Nov 11, 2020
b048047
Remove console logs
schettn Nov 11, 2020
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
8 changes: 7 additions & 1 deletion .env.template
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
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"homepage": "https://snek.at",
"license": "(EUPL-1.2)",
"dependencies": {
"faker": "^5.1.0",
"fuzzysort": "^1.1.4",
"gh-pages": "^3.1.0",
"js-sha256": "^0.9.0",
Expand All @@ -18,14 +19,15 @@
"react-redux": "^7.2.0",
"react-redux-loading-bar": "^4.6.0",
"react-router-dom": "^5.0.1",
"react-simple-maps": "^2.1.2",
"react-text-loop": "^2.3.0",
"react-typed": "^1.2.0",
"reactjs-oauth": "0.1.0",
"reactjs-oauth": "^0.2.0",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"serialize-error": "^7.0.1",
"snek-client": "file:snek-client-0.2.0-beta.tgz",
"snek-intel": "^0.1.1",
"snek-client": "file:snek-client-0.2.0-rc.7.tgz",
"snek-intel": "file:snek-intel-0.2.0-rc.6.tgz",
"tippy.js": "^6.2.3"
},
"repository": {
Expand All @@ -40,11 +42,11 @@
"eject": "react-scripts eject"
},
"devDependencies": {
"renamer": "^1.0.0",
"rimraf": "^2.6.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-scripts": "^3.4.1"
"react-scripts": "^4.0.0",
"renamer": "^1.0.0",
"rimraf": "^2.6.2"
},
"browserslist": [
">0.2%",
Expand Down
8 changes: 8 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<!--
Here is a flag for you, ENV.FLAG_INSPECTOR. Keep on searching and find them all.
-->
<link rel="apple-touch-icon" sizes="57x57" href="%PUBLIC_URL%/fav/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/fav/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/fav/apple-icon-72x72.png">
Expand Down Expand Up @@ -76,4 +79,9 @@
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
<script>
function getFlag() {
console.log('%FLAG_CONSOLE_USER%')
}
</script>
</html>
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import LoadingBarContainer from "react-redux-loading-bar";

//> Actions
// Functions to send data from the application to the store
import { loginAction } from "./store/actions/authActions";
import { loginAction } from "./store/actions/userActions";
//> Components
import { Footer, Navbar } from "./components/molecules";
// Starts the page on top when reloaded or redirected
Expand Down
24 changes: 15 additions & 9 deletions src/Routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import { Route, Switch } from "react-router-dom";
//> Components
import {
HomePage,
ProfilePage,
PersonPage,
CompanyPage,
TalkPage,
SettingsPage,
TempPage,
} from "./components/pages";
//#endregion

Expand All @@ -26,7 +25,7 @@ class Routes extends React.Component {
<Route
exact
path="/u/:username"
component={(props) => <ProfilePage {...props} />}
component={(props) => <PersonPage {...props} />}
/>
<Route
exact
Expand All @@ -35,14 +34,9 @@ class Routes extends React.Component {
/>
<Route
exact
path="/t/:username/:uid"
path="/t/:uid"
component={(props) => <TalkPage {...props} />}
/>
<Route
exact
path="/temp"
component={(props) => <TempPage {...props} />}
/>
<Route
exact
path="/redirect"
Expand All @@ -58,6 +52,18 @@ class Routes extends React.Component {
path="/settings"
component={(props) => <SettingsPage {...props} />}
/>
<Route
exact
path="/path/explorer"
render={function () {
return (
<div>
Here is a flag for you {process.env.FLAG_PATH_EXPLORER}. Keep on
searching and find them all.
</div>
);
}}
/>
<Route
render={function () {
return <h1>Not Found</h1>;
Expand Down
83 changes: 83 additions & 0 deletions src/components/atoms/Achievement/index.jsx
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
*/
26 changes: 12 additions & 14 deletions src/components/atoms/Project/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,25 @@ class Project extends React.Component {
/>
<small>
@
{repo.owner.username ? (
{repo.owner ? (
repo.owner.username
) : (
<span className="text-muted">unknown</span>
)}
</small>
</div>
<div className="pt-3">
{repo.languages.length > 0 && (
<LanguageChart languages={repo.languages} />
)}
{repo.languages.length > 0 && (
<small className="text-left text-muted">
<MDBIcon
icon="square"
className="pr-1"
style={{ color: repo.languages[0].color }}
/>
{repo.languages[0].name ? repo.languages[0].name : "Unknown"}
</small>
)}
<LanguageChart languages={repo.languages} />
<small className="text-left text-muted">
<MDBIcon
icon="square"
className="pr-1"
style={{
color: repo.languages ? repo.languages[0].color : "grey",
}}
/>
{repo.languages ? repo.languages[0].name : "Unknown"}
</small>
</div>
</li>
</a>
Expand Down
24 changes: 13 additions & 11 deletions src/components/atoms/SearchBar/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { connect } from "react-redux";

//> Actions
// Functions to send data from the application to the store
import { getUserSearchItems } from "../../../store/actions/generalActions";
import { getPersonsBrief } from "../../../store/actions/generalActions";
//> Style sheet
import "./search.scss";
//#endregion
Expand Down Expand Up @@ -52,8 +52,6 @@ class SearchBar extends React.Component {
handleSelection = (event, value) => {
if (event === "user") {
this.props.history.push("/u/" + value);
} else if (event === "search_page") {
this.props.history.push("/search?q=" + value);
}
};

Expand Down Expand Up @@ -84,24 +82,28 @@ class SearchBar extends React.Component {
<MDBSelectInput selected="Find a user" />
<MDBSelectOptions search searchLabel="">
{!this.state.loading && this.state.searchItems ? (
this.state.searchItems.length > 0 && this.state.filter.length > 0 ? (

this.state.searchItems.length > 0 &&
this.state.filter.length > 0 ? (
fuzzysort
.go(this.state.filter, this.state.searchItems, { key: "title" })
.map((element, i) => {
return (
<MDBSelectOption
key={i}
icon={"https://octodex.github.com/images/nyantocat.gif"}
icon={
element.obj.avatarImage?.src
? element.obj.avatarImage?.src
: "https://octodex.github.com/images/nyantocat.gif"
}
>
{element.target}
{element.obj.slug.split("-")[1]}
</MDBSelectOption>
);
})
) : null
) : (
<span>Loading</span>
)}
<span>Loading</span>
)}
</MDBSelectOptions>
</MDBSelect>
);
Expand All @@ -111,12 +113,12 @@ class SearchBar extends React.Component {

//#region > Redux Mapping
const mapStateToProps = (state) => ({
allUserSearchItems: state.general.allUserSearchItems,
allUserSearchItems: state.general.allPersonBrief,
});

const mapDispatchToProps = (dispatch) => {
return {
allsearchItems: () => dispatch(getUserSearchItems()),
allsearchItems: () => dispatch(getPersonsBrief()),
};
};
//#endregion
Expand Down
2 changes: 1 addition & 1 deletion src/components/atoms/charts/AIContribCalendar/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class AIContribCalendar extends React.Component {
// Get current month
let current;

if (this.props.year) {
if (this.props.year !== undefined) {
current = 0;
} else {
current = new Date().getMonth();
Expand Down
Loading