Commit 74b72473 authored by schneider210's avatar schneider210
Browse files

feat: release: resolve conflicts and merge develop into main

parents 6b89854a 2d650e9a
Pipeline #170293 passed with stages
in 2 minutes and 42 seconds
{
"plugins": ["@babel/plugin-syntax-dynamic-import"],
"env": {
"test": {
"plugins": ["dynamic-import-node"],
"presets": [
[
"@babel/preset-env",
{
"modules": "commonjs",
"targets": {
"node": "current"
}
}
]
]
}
}
}
......@@ -15,9 +15,9 @@ module.exports = {
// Uncomment any of the lines below to choose desired strictness,
// but leave only one uncommented!
// See https://eslint.vuejs.org/rules/#available-rules
'plugin:vue/essential' // Priority A: Essential (Error Prevention)
// 'plugin:vue/essential' // Priority A: Essential (Error Prevention)
// 'plugin:vue/strongly-recommended' // Priority B: Strongly Recommended (Improving Readability)
// 'plugin:vue/recommended' // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
'plugin:vue/recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
],
// required to lint *.vue files
......@@ -50,6 +50,7 @@ module.exports = {
'prefer-promise-reject-errors': 'off',
// allow debugger during development only
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'max-len': 0
}
}
.DS_Store
.thumbs.db
.npmrc
node_modules
# Quasar core related directories
......
......@@ -14,8 +14,10 @@ build_test:
- develop
stage: build
script:
- ./set_entrypoint_ci.sh
- npm install
- quasar build
- npm run build
- npm run tweak:build
artifacts:
paths:
- dist/
......@@ -27,19 +29,34 @@ build_main_and_develop:
- develop
stage: build
script:
- ./set_entrypoint_ci.sh
- npm install
- quasar build
- npm run build
- npm run tweak:build
artifacts:
paths:
- dist/
expire_in: never
update-ahikar:
stage: deploy
only:
- main
variables:
UPDATE: "true"
UPSTREAM_COMMIT_SHA: "${CI_COMMIT_SHA}"
trigger: "subugoe/ahiqar/ahiqar-tido"
pages:
before_script:
- dnf install -y jq
- dnf install -y zip
- dnf install -y unzip
image: docker.gitlab.gwdg.de/mgoebel/swiss_knife/fedora:latest
# at the very early stage lets deploy for every branch
# only:
# - main
# - develop
stage: deploy
cache:
untracked: true
......@@ -77,11 +94,12 @@ pushback:
script:
- npm install
- npm run build
- mkdir emo-viewer && mv dist/js/* emo-viewer/
- npm run tweak:build
- mkdir tido && mv dist/* tido/
artifacts:
expire_in: 5 yrs
paths:
- emo-viewer
- tido
# when a git flow release is made, a tag will be pushed starting this job. it
# will keep the resulting artifact from the job declared in `JOB_NUMBER_TO_PRESERVE`
......
# Bug fix
Well, it seems that it is impossible to write software without bugs.
That's why we are really happy that you are here.
Thank you very much!
Please take a moment to help us include the purposed bug fix by filling out the following form.
Feel free to delete sections that doesn't suit the case you're dealing with.
## Summary
Apart from what is mentioned in the main ticket you are going to close with this
MR, tell us what you have done to achieve this goal.
## Related Tickets
Add all related issues and especially those to be closed.
Keep in mind that every `bugfix` branch needs an issue that properly describes the bug beforehand.
If your fix addresses something untracked, please open a ticket first.
## Does the result of the MR comply to our "definition of done"?
* [ ] Unit tests passed
......@@ -31,9 +18,13 @@ If your fix addresses something untracked, please open a ticket first.
### Closes
## Changelog
* [ ] I added a statement to the CHANGELOG.
## Documentation
* [ ] I updated the README (if applicable)
* [ ] I provided my functions with appropriate documentation
/cc [Mathias Göbel](https://gitlab.gwdg.de/mgoebel), [Frank Schneider](https://gitlab.gwdg.de/schneider210), [Michelle Weidling](https://gitlab.gwdg.de/mrodzis)
# Feature
We welcome every new feature to the upstream branch!
Please fill in the following information about your feature.
Feel free to delete sections that doesn't suit the case you're dealing with.
## Summary
This MR provides…
......@@ -18,26 +13,11 @@ This MR provides…
* [ ] Non-Functional requirements met
* [ ] Product Owner accepts the User Story
## Use Cases
If you can, please provide use cases for this feature.
## Documentation
Shall we add your feature to the documentation?
* [ ] I've already did it!
* [ ] At least I added a headline to the documentation.
### Function Documentation
* [ ] Of course I provided all my functions with an appropriate documentation.
### Are there parts of the documentation we have to adjust
* [ ] No.
* [ ] Yes, but I'd like someone else to do it.
* [ ] Yes, and I already did!
* [ ] I updated the README (if applicable)
* [ ] I provided my functions with appropriate documentation
* [ ] I adjusted other parts of the documentation (if applicable)
## Tests
......
changelog.md
/node_modules
\ No newline at end of file
{
"MD013": false
}
\ No newline at end of file
{
"extends": [
"stylelint-config-sass-guidelines",
"stylelint-8-point-grid"
],
"plugins": [
"stylelint-no-unsupported-browser-features"
],
"rules": {
"selector-class-pattern": "[a-z]+",
"max-nesting-depth": [
2,
{
"severity": "error"
}
],
"scss/dollar-variable-pattern": null,
"plugin/no-unsupported-browser-features": [
true,
{
"severity": "warning"
}
]
}
}
\ No newline at end of file
{
"blocks": "never",
"brackets": "never",
"colons": "never",
"colors": "always",
"commaSpace": "always",
"commentSpace": "always",
"cssLiteral": "never",
"depthLimit": false,
"duplicates": true,
"efficient": "always",
"extendPref": false,
"globalDupe": true,
"indentPref": 2,
"leadingZero": "never",
"maxErrors": false,
"maxWarnings": false,
"mixed": false,
"namingConvention": false,
"namingConventionStrict": false,
"none": "never",
"noImportant": false,
"parenSpace": "never",
"placeholder": false,
"prefixVarsWithDollar": "always",
"quotePref": "single",
"semicolons": "never",
"sortOrder": false,
"stackedProperties": "never",
"trailingWhitespace": "never",
"universal": "never",
"valid": true,
"zeroUnits": "never",
"zIndexNormalize": false
}
{
"commitUrlFormat": "https://gitlab.gwdg.de/subugoe/emo/Qviewer/-/commit/{{hash}}",
"compareUrlFormat": "https://gitlab.gwdg.de/subugoe/emo/Qviewer/compare/{{previousTag}}...{{currentTag}}",
"issueUrlFormat": "https://gitlab.gwdg.de/subugoe/emo/Qviewer/-/issues/{{id}}",
"types": [
{"type": "chore", "section":"Chore", "hidden": false},
{"type": "revert", "section":"Reverts", "hidden": false},
{"type": "feat", "section": "Features", "hidden": false},
{"type": "fix", "section": "Bug Fixes", "hidden": false},
{"type": "improvement", "section": "Improvements", "hidden": false},
{"type": "docs", "section":"Docs", "hidden": false},
{"type": "style", "section":"Styling", "hidden": false},
{"type": "refactor", "section":"Refactoring", "hidden": false},
{"type": "perf", "section":"Performance", "hidden": false},
{"type": "test", "section":"Tests", "hidden": false},
{"type": "build", "section":"Build System", "hidden": false},
{"type": "ci", "section":"Continuos Integration", "hidden":false}
]
}
\ No newline at end of file
......@@ -5,19 +5,142 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
### Added
## [1.4.5] - 2020-11-02
### Fixed
- remove collection check in mainView to keep single manifests displayed as well.
## [1.4.4] - 2020-11-02
### Added
- Update downstream projects via CI pipeline trigger.
## [1.4.3] - 2020-10-05
### Added
- New local store for tree component.
### Fixed
- re-rendering of components when drag and drop on dialog modal.
## [1.4.2] - 2020-10-01
### Added
- .nvmrc containing node version
### Fixed
- quoting in css/responsive-heights.scss
## [1.4.1] - 2020-09-29
### Added
- Add config for unit tests via jest. testfiles goto *tests/unit/specs/*test.js*
### Changed
- delete tab-folder with components. provided a computed prop to wait for conditional changes
## [1.4.0] - 2020-09-11
### Added
- Refactored drag and drop component in order to make it user configurable.
- Moved panel data structure into a separate component where panels can be configured.
## [1.3.3] - 2020-09-10
### Changed
- GitLab templates have been tidied up.
Also a passage explicitly mentioning the README has been added to them (where applicable).
## [1.3.2] - 2020-09-02
### Added
- additional metadata on manifestlevel. e.g. `date`, `editor`, `origin`, `location`
## [1.3.1] - 2020-08-28
### Fixed
- the CI artifacts created on the `develop` and `main` branch are no longer automatically removed
after 30 days.
## [1.3.0] - 2020-08-24
### Added
- Refactored mainview template. Components are dynamic now and the order is configurable
- New button to the toggle bar so that user can able to configure order of the panels dynamically.
- created a new re-usable component to drag and drop panels.
### Changed
- refactored toggleIndex component.
## [1.2.1] - 2020-08-12
### Changed
- refactored toggleBar to toggleIndex / toggleFilter according to window size. toggle switches at 1100px
## [1.2.0] - 2020-08-03
### Changed
- The logic of using splitters for mainview is removed and made use of Grid in order to make viewer responsive.
### Added
- Moved toggle buttons from the header into a dropdown menu items.
## [1.1.1] - 2020-08-03
### Fixed
- fix tree bug if meta panel is active. implement listener for active panel tab
## [1.1.0] - 2020-07-29
### Added
- metadata panel exchanged by annotation panel (no content yet). therefore metadata goes into the tree panel.
both of the latter became tabs inside this one panel.
- panel order changed to: contents / metadata (tabs), image, text, annotations
## [1.0.1]- 2020-07-30
### Changed
- The content of the development branch is no longer purged from the artifacts, even if the branch hasn't been updated for 14 days.
This way we ensure that <https://subugoe.pages.gwdg.de/emo/Qviewer/develop/#/> always works.
## [1.0.0] - 2020-07-27
### Added
- Preparation for EMo Viewer initial release v1.0.0
## [0.1.0] - 2020-07-24
### Fixed
- bug in navigation: itemindex was updated too late; lacking the corresponding sequenceindex. passed the latter to listener
## [0.0.24] - 2020-07-22
### Added
- license AGPL v3.0
- NOTICE
- license info in softwareinfo
......@@ -91,7 +214,6 @@ We only rely on previous artifacts for new pipelines.
- Reverted the changes and fixed the icons to nest inside image.
## [0.0.14] - 2020-06-23
### Added
......
......@@ -31,6 +31,10 @@ All issues will be arranged in [milestones](https://gitlab.gwdg.de/groups/subugo
Milestones are always group-wide, so we combine tickets from all repositories associated with Ahiqar to a single milestone.
The milestone number is increased with each sprint in accordance to [Semantic Versioning](https://semver.org/).
### Controlled Commits
Husky and Commitizen is used and you are advised to not bypass things. If there is no other way as to deactivate a linter do it on line/block basis and add a FIXME comment.
### Merge Requests (MR)
Merge requests should be peer reviewed before merging them into `develop`.
......@@ -62,3 +66,15 @@ The MUST assignee informs the developer over the review being done.
7. The developer merges her changes into the development branch.
If a merge conflict occurs the person who has proposed the MR is responsible for solving all conflicts.
## Coding Guidelines
### (S)CSS
* Measure things by 8, so 2,4,8,12,16,20,24 etc, but not 3,5,8,10,15 etc. you get the idea; there should never be an odd number
* Follow BEM class naming. There are like a gazillion ideas on how to do it, but at least stick to the core idea of Block/Element/Modifier as seen e.g. here [BEM Intro](http://getbem.com/introduction/) and [BEM 101](https://css-tricks.com/bem-101/) (referenced by MDN)
* Always lint code use npm run lint:css which uses Stylelint with Scss config/rules (insert link to stylelint rules file here as soon as there is a main branch)
* Make css class name self explanatory (see BEM)
* No id for styling, stick to classes. If you need to access CSS class names for JS, write one and prepend "js-" and make sure to not attach any CSS to it.
* Use color variables instead of color values (or names) and have a file where all vars are defined
* When using vue.js and Scss go with global Scss files or scoped Scss (within vue.js files) but avoid mixing it at all cost. Global mixin and varibales Scss files are fine, but Scss within a single vue.js file should never affect styling anywhere else.
# Copyright
Copyright (c) 2020 Göttingen University - Göttingen State and University Library
Licensed under GNU Affero General Public License v3.0
This diff is collapsed.
const fs = require('fs-extra')
let extend = undefined
/**
* The .babelrc file has been created to assist Jest for transpiling.
* You should keep your application's babel rules in this file.
*/
if (fs.existsSync('./.babelrc')) {
extend = './.babelrc'
}
module.exports = {
presets: [
'@quasar/babel-preset-app'
]
],
extends: extend
}
module.exports = {
globals: {
__DEV__: true
},
setupFilesAfterEnv: [
// '<rootDir>/tests/unit/jest.setup.js'
],
// noStackTrace: true,
// bail: true,
// cache: false,
// verbose: true,
// watch: true,
collectCoverage: false,
coverageDirectory: '<rootDir>/tests/unit/coverage',
collectCoverageFrom: [
'<rootDir>/src/**/*.vue',
'<rootDir>/src/**/*.js'
// '<rootDir>/src/**/*.ts',
// '<rootDir>/src/**/*.jsx'
],
coverageThreshold: {
global: {
// branches: 50,
// functions: 50,
// lines: 50,
// statements: 50
}
},
testMatch: [
'<rootDir>/tests/unit/**/*.spec.js',
'<rootDir>/tests/unit/**/*.test.js'
],
moduleFileExtensions: [
'vue',
'js',
'json'
// 'ts',
// 'tsx'
],
moduleNameMapper: {
'^vue$': '<rootDir>/node_modules/vue/dist/vue.common.js',
'^test-utils$': '<rootDir>/node_modules/@vue/test-utils/dist/vue-test-utils.js',
'^quasar$': '<rootDir>/node_modules/quasar/dist/quasar.common.js',
'^~/(.*)$': '<rootDir>/$1',
'^@/(.*)$': '<rootDir>/src/$1',
'^src/(.*)$': '<rootDir>/src/$1'
// '.*css$': '<rootDir>/test/unit/utils/stub.css'
},
transform: {
'.*\\.vue$': 'vue-jest',
'.*\\.js$': 'babel-jest',
'.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
// use these if NPM is being flaky
// '.*\\.vue$': '<rootDir>/node_modules/@quasar/quasar-app-extension-testing-unit-jest/node_modules/vue-jest',
// '.*\\.js$': '<rootDir>/node_modules/@quasar/quasar-app-extension-testing-unit-jest/node_modules/babel-jest'
},
transformIgnorePatterns: [
'<rootDir>/node_modules/(?!quasar/lang)'
],
snapshotSerializers: [
'<rootDir>/node_modules/jest-serializer-vue'
]
}
This diff is collapsed.
{
"name": "viewer",
"version": "1.0.0",
"description": "Viewer for the modular framework to present digital editions",
"productName": "EMo Viewer",
"name": "@subugoe/tido",
"version": "1.4.21",
"description": "Text vIever for Digital Objects",
"productName": "TIDO",
"keywords": [
"viewer",
"emo",
"digital editions",
"vue",
"quasar",
"openseadragon",
"sub"
"quasar",
"subugoe",
"TIDO",
"viewer",
"vue"
],
"cordovaId": "de.uni-goettingen.sub.emo",
"capacitorId": "",
"bugs": {
"email": "gitlab+subugoe-emo-qviewer-10921-issue-@gwdg.de"
},
"license": {
"license": "AGPL-3.0-or-later"
},
"author": "Frank Schneider <frank.schneider@sub.uni-goettingen.de>",
"license": "AGPL-3.0-or-later",
"author": "Göttingen State and University Library - SUB",
"contributors": [
"Manikanth Dindigala <dindigala@sub.uni-goettingen.de>",
"Mathias Göbel <goebel@sub.uni-goettingen.de>",
"Frank Schneider <frank.schneider@sub.uni-goettingen.de>",
"Michelle Weidling <weidling@sub.uni-goettingen.de>",
"Nils Windisch <windisch@sub.uni-goettingen.de>"
],
......@@ -33,36 +31,86 @@
},
"private": false,
"dependencies": {
"@quasar/extras": "^1.9.0",
"@quasar/extras": "^1.9.14",
"openseadragon": "^2.4.2",
"quasar": "^1.12.13"
"quasar": "^1.15.1",
"vuedraggable": "^2.24.3"
},
"devDependencies": {
"@quasar/app": "^1.9.6",
"autoprefixer": "9.7.6",
"babel-eslint": "^10.0.1",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.2.0",
"eslint-loader": "^3.0.3",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-vue": "^6.1.2",
"@quasar/app": "^2.1.14",
"@quasar/quasar-app-extension-testing-unit-jest": "^2.2.1",
"autoprefixer": "9.8.6",
"babel-eslint": "^10.1.0",
"commitizen": "^4.2.2",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^7.18.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-loader": "^4.0.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-vue": "^7.5.0",
"husky": "^4.3.7",
"markdownlint-cli": "^0.26.0",
"node-sass": "^4.14.1",
"sass": "^1.26.10",
"sass-loader": "8.0.2"