Skip to content

Commit

Permalink
update all packages
Browse files Browse the repository at this point in the history
bump version
fix for spring 2020
  • Loading branch information
hanzhi713 committed Oct 12, 2019
1 parent 58307d5 commit 87c59bb
Show file tree
Hide file tree
Showing 7 changed files with 360 additions and 380 deletions.
698 changes: 335 additions & 363 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "awesome-schedule",
"version": "7.3.0",
"version": "7.4.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand All @@ -26,7 +26,7 @@
"vue-class-component": "^7.1.0",
"vue-mathjax": "0.0.10",
"vue-property-decorator": "^8.2.2",
"vuedraggable": "^2.23.1"
"vuedraggable": "^2.23.2"
},
"devDependencies": {
"@types/bootstrap": "^4.3.1",
Expand All @@ -35,14 +35,14 @@
"@types/jest": "^23.1.4",
"@types/jquery": "^3.3.31",
"@types/lz-string": "^1.3.33",
"@types/node": "^12.7.5",
"@types/node": "^12.7.12",
"@types/papaparse": "^5.0.1",
"@types/randomcolor": "^0.5.3",
"@vue/cli-plugin-babel": "^3.10.0",
"@vue/cli-plugin-eslint": "^3.10.0",
"@vue/cli-plugin-typescript": "^3.10.0",
"@vue/cli-plugin-unit-jest": "^3.10.0",
"@vue/cli-service": "^3.10.0",
"@vue/cli-plugin-babel": "^3.12.0",
"@vue/cli-plugin-eslint": "^3.12.0",
"@vue/cli-plugin-typescript": "^3.12.0",
"@vue/cli-plugin-unit-jest": "^3.12.0",
"@vue/cli-service": "^3.12.0",
"@vue/eslint-config-prettier": "^5.0.0",
"@vue/eslint-config-typescript": "^4.0.0",
"@vue/test-utils": "1.0.0-beta.29",
Expand All @@ -61,7 +61,7 @@
"typedoc": "^0.15.0",
"typedoc-plugin-external-module-name": "^2.1.0",
"typedoc-plugin-no-inherit": "^1.1.10",
"typescript": "^3.6.3",
"typescript": "^3.6.4",
"vue-template-compiler": "^2.6.10",
"worker-loader": "^2.0.0"
}
Expand Down
8 changes: 4 additions & 4 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
integrity="sha256-GAVdfR/7cRNqncNsUBZSbgGaHPgQ5yhi9FMjm+3AJTw=" crossorigin="anonymous"></script>

<!-- new version, doesn't work -->
<!-- <script src="https://cdn.jsdelivr.net/npm/[email protected]/Sortable.min.js"
integrity="sha256-h5esCRvE+shjlH7Dtl7ly6ByDKH5bI9PFvM8OeThBTM=" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/vuedraggable.umd.min.js"
integrity="sha256-tDyC8RLjZqTdJIHT93mjATzSSrC6MmRjW4mfvHaeuXA=" crossorigin="anonymous"></script> -->
<!-- <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuedraggable.umd.min.js"
integrity="sha256-GAVdfR/7cRNqncNsUBZSbgGaHPgQ5yhi9FMjm+3AJTw=" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected].1/Sortable.min.js"
integrity="sha256-9D6DlNlpDfh0C8buQ6NXxrOdLo/wqFUwEB1s70obwfE=" crossorigin="anonymous"></script> -->

<!-- MathJax is used in information.vue only, so it could be lazy-loaded -->
<script async src="https://cdn.jsdelivr.net/npm/[email protected]/unpacked/MathJax.js?config=TeX-AMS_HTML"
Expand Down
2 changes: 1 addition & 1 deletion src/App.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import { getReleaseNote } from './utils';
/**
* need to change for every release
*/
const version = '7.3';
const version = '7.4';
/**
* returns whether the version stored in localStorage matches the current version
* then, override localStorage with the current version
Expand Down
5 changes: 5 additions & 0 deletions src/store/schedule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ export class ScheduleStore implements StoreModule<ScheduleState, ScheduleStateJS
this.proposedSchedules.forEach(s => s.computeSchedule(sync, time));
}

/**
* @note the schedules parsed from JSON are **not** computed (i.e. the `computeSchedule` method is not called)
* @note the `currentSchedule` is not assigned.
* @param obj
*/
fromJSON(obj: Partial<ScheduleStateJSON>) {
const defaultState = this.getDefault();

Expand Down
5 changes: 4 additions & 1 deletion src/store/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,15 @@ export default class Store extends Vue {
this.schedule.fromJSON(newStore.schedule || {});
this.palette.fromJSON(newStore.palette || {});
}
// update schedule global options
Schedule.colors = colorSchemes[this.display.colorScheme].colors;
Schedule.combineSections = this.display.combineSections;
Schedule.multiSelect = this.display.multiSelect;
this.schedule.recomputeAll();

if (this.schedule.generated) this.generateSchedules();
else this.schedule.switchSchedule(false);

this.schedule.recomputeAll(); // need to compute all schedules for rendering
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/profile.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ test('profile basic', async () => {
s.profile.initProfiles(s.semester.semesters);

s.profile.addProfile(JSON.stringify({ name: 'prof1' }), '');
expect(s.profile.profiles).toEqual(['Fall 2019', 'prof1']);
s.profile.deleteProfile('Fall 2019', 0);
expect(s.profile.profiles).toEqual(['Spring 2020', 'prof1']);
s.profile.deleteProfile('Spring 2020', 0);

s.profile.addProfile(JSON.stringify({ name: 'prof2' }), '');
expect(s.profile.current).toBe('prof2');
Expand Down

0 comments on commit 87c59bb

Please sign in to comment.