Skip to content

Commit

Permalink
chore: Replaces HT2 Labs with Learning Pool. (#1492)
Browse files Browse the repository at this point in the history
  • Loading branch information
ryasmi authored Dec 17, 2019
1 parent 07504d0 commit 6639ea5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 21 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
[![License](https://poser.pugx.org/learninglocker/learninglocker/license.svg)](http://opensource.org/licenses/GPL-3.0)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/LearningLocker/learninglocker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

*Learning Locker is copyright [HT2](https://ht2labs.com)*
*Learning Locker is copyright [Learning Pool](https://learningpool.com/)*

Please see our [documentation](http://docs.learninglocker.net) for installation, configuration, and usage instructions.
17 changes: 7 additions & 10 deletions cli/src/commands/migrateToInQueries.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@ import Query from 'lib/models/query';
*/
const isActor = criteriaPath =>
criteriaPath.length === 2
&& criteriaPath[0] === 'statement'
&& criteriaPath[1] === 'actor';
&& criteriaPath[0] === 'statement'
&& criteriaPath[1] === 'actor';

/**
* @param {immutable.List} criteriaPath
* @returns {boolean}
*/
const isPersonaId = criteriaPath =>
criteriaPath.length > 2
&& criteriaPath[0] === 'persona'
&& criteriaPath[1] === 'import';
&& criteriaPath[0] === 'persona'
&& criteriaPath[1] === 'import';

/**
* @param {immutable.List} criteriaPath
* @returns {boolean}
*/
const isContextInstructor = criteriaPath =>
criteriaPath.length === 3
&& criteriaPath[0] === 'statement'
&& criteriaPath[1] === 'context'
&& criteriaPath[2] === 'instructor';
&& criteriaPath[0] === 'statement'
&& criteriaPath[1] === 'context'
&& criteriaPath[2] === 'instructor';

/**
* @param {immutable.Map} condition
Expand Down Expand Up @@ -101,9 +101,6 @@ const _buildNewQuery = (oldQuery) => {

/**
* Convert query strings
*
* https://ht2labs.myjetbrains.com/youtrack/issue/LL-595
*
* @param {string} oldQuery
* @returns {string}
*/
Expand Down
4 changes: 2 additions & 2 deletions cli/src/seed/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ const resetState = async () => {
await doMigrations({ migrations: v2Migrations });

// add a user
await createSiteAdmin('chris.bishop@ht2labs.com', 'Test organisation', 'password0', {});
await createSiteAdmin('test@learningpool.com', 'Test organisation', 'password0', {});

logger.info('Reset success');
};

const getToken = async () => {
const user = await User.findOne({
email: 'chris.bishop@ht2labs.com'
email: 'test@learningpool.com'
});

const organisation = await Organisation.findOne({
Expand Down
4 changes: 2 additions & 2 deletions lib/helpers/tests/update$dteTimezoneInDB-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('helpers/update$dteTimezoneInDB', () => {
});

user = await User.create({
email: `${organisation._id.toString()}@ht2labs.com`,
email: `${organisation._id.toString()}@learningpool.com`,
organisations: [organisation._id],
organisationSettings: [
{
Expand All @@ -79,7 +79,7 @@ describe('helpers/update$dteTimezoneInDB', () => {
});

user2 = await User.create({
email: `${organisation2._id.toString()}@ht2labs.com`,
email: `${organisation2._id.toString()}@learningpool.com`,
organisations: [organisation2._id],
organisationSettings: [
{
Expand Down
1 change: 0 additions & 1 deletion lib/models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ async function validatePassword(value) {
}

// TODO: Remove `organisationSettings.oldFilter` and `hasBeenMigrated` after we confirm success of $in migration
// See: https://ht2labs.myjetbrains.com/youtrack/issue/LL-595
const schema = new mongoose.Schema({
name: { type: String },
email: {
Expand Down
1 change: 0 additions & 1 deletion lib/models/visualisation.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const buildJsonValidators = columnName => ({
});

// TODO: Remove `oldAxesxQuery`, `oldAxesyQuery`, `oldFilters`, and `hasBeenMigrated` after we confirm success of $in migration
// See: https://ht2labs.myjetbrains.com/youtrack/issue/LL-595
const schema = new mongoose.Schema({
description: { type: String },
type: { type: String },
Expand Down
8 changes: 4 additions & 4 deletions ui/src/components/FullPageBackground/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const versionDisplay = (version) => {
const shortDisplay = `Build: ${branch} @ ${short}`;

const display = (branch === 'master' || branch === 'HEAD') ? tag : shortDisplay;
return <p className={styles.version} title={longDisplay}>{ display }</p>;
return <p className={styles.version} title={longDisplay}>{display}</p>;
};

const FullPageBackground = ({ version, children, width = 600 }) => (
Expand All @@ -45,10 +45,10 @@ const FullPageBackground = ({ version, children, width = 600 }) => (
<span className={styles.headline}>making learning measurable</span>
<div className={styles.underline} />
<div style={{ width }}>
{ children }
{children}
</div>
<p className={styles.copyright}>&copy; {new Date().getFullYear()} <a href="https://www.ht2labs.com" title="HT2 Labs - Pioneers in Workplace Digital Learning" target="_blank" rel="noopener noreferrer">HT2 Labs</a></p>
{ versionDisplay(version) }
<p className={styles.copyright}>&copy; {new Date().getFullYear()} <a href="https://www.learningpool.com" title="Learning Pool - Innovation. Passion. Learning." target="_blank" rel="noopener noreferrer">Learning Pool</a></p>
{versionDisplay(version)}
</div>
</div>
);
Expand Down

0 comments on commit 6639ea5

Please sign in to comment.