diff --git a/assets/style.less b/assets/style.less index 4ab71e68..48027994 100644 --- a/assets/style.less +++ b/assets/style.less @@ -1,3 +1,6 @@ +// .v-list { +// color: pink; +// } // :focus {outline:none;} // ::-moz-focus-inner {border:0;} diff --git a/components/Editor.vue b/components/Editor.vue index d8778cc9..3f83f6b4 100644 --- a/components/Editor.vue +++ b/components/Editor.vue @@ -84,6 +84,7 @@ export default { name: 'Editor', components: { EditorContent, EditorMenuBar, EditorMenuBubble }, props: { + label: { type: String, default: 'Editor' }, value: { type: String, default: '' }, border: { type: Boolean, default: false }, noSave: { type: Boolean, default: false }, @@ -155,6 +156,15 @@ export default { font-style: italic; } .editor { + .label { + left: 0px; + position: absolute; + transition: translateY .3s, scale .3s; + &.focused { + color: orange; + transform: translateY(-10px) scale(0.75); + } + } // max-height: auto; // height: auto; overflow-y: auto; diff --git a/locales/en.json b/locales/en.json index 460a5f76..785d3eec 100644 --- a/locales/en.json +++ b/locales/en.json @@ -83,7 +83,8 @@ "place": "Place", "tags": "Tags", "theme": "Theme", - "reset": "Reset" + "reset": "Reset", + "import": "Import" }, "login": { "description": "By logging in you can publish new events.", @@ -149,7 +150,9 @@ "interact_with_me_at": "Interact with me on fediverse at", "follow_me_description": "One of the ways to stay up to date on events published here on {title},\nis following the account {account} from the fediverse, for example via mastodon, and possibly add resources to an event from there.

\nIf you have never heard of Mastodon and the fediverse we recommend reading this article.

Enter your instance below (e.g. mastodon.social)", "interact_with_me": "Follow me", - "remove_recurrent_confirmation": "Are you sure you want to remove this recurring event?\nPast events will be maintained, but no further events will be created." + "remove_recurrent_confirmation": "Are you sure you want to remove this recurring event?\nPast events will be maintained, but no further events will be created.", + "import_URL": "Import from URL", + "import_ICS": "Import from ICS" }, "admin": { "place_description": "If you have gotten the place or address wrong, you can change it.
All current and past events associated with this place will change address.", diff --git a/package.json b/package.json index 225bfd79..efe6f098 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,9 @@ "email-templates": "^7.1.1", "express": "^4.17.1", "express-oauth-server": "^2.0.0", + "fs": "^0.0.1-security", "http-signature": "^1.3.5", + "ical.js": "^1.4.0", "ics": "^2.25.0", "inquirer": "^7.3.3", "jsdom": "^16.4.0", @@ -59,7 +61,7 @@ "multer": "^1.4.2", "nuxt": "^2.14.6", "nuxt-express-module": "^0.0.11", - "pg": "^8.4.0", + "pg": "^8.4.1", "sequelize": "^6.3.5", "sequelize-cli": "^6.2.0", "sharp": "^0.26.1", @@ -78,7 +80,7 @@ "@nuxtjs/eslint-config": "^3.1.0", "@nuxtjs/vuetify": "^1.11.2", "babel-eslint": "^10.1.0", - "eslint": "^7.10.0", + "eslint": "^7.11.0", "eslint-config-prettier": "^6.12.0", "eslint-config-standard": ">=14.1.1", "eslint-loader": "^4.0.2", @@ -89,15 +91,15 @@ "eslint-plugin-promise": ">=4.0.1", "eslint-plugin-standard": ">=4.0.1", "eslint-plugin-vue": "^7.0.1", - "less-loader": "^7.0.1", + "less-loader": "^7.0.2", "nodemon": "^2.0.4", "prettier": "^2.1.2", "pug-plain-loader": "^1.0.0", "sass": "^1.27.0", - "sass-loader": "^10.0.2", + "sass-loader": "^10.0.3", "vue-cli-plugin-vuetify": "~2.0.7", "vuetify-loader": "^1.3.0", - "webpack-cli": "^3.3.12" + "webpack-cli": "^4.0.0" }, "resolutions": { "prosemirror-model": "1.11.2" diff --git a/pages/add/ImportDialog.vue b/pages/add/ImportDialog.vue index 4e0a3d33..59724434 100644 --- a/pages/add/ImportDialog.vue +++ b/pages/add/ImportDialog.vue @@ -1,24 +1,40 @@