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

Upload #108

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
9c44029
Oauth 2
zexigong May 29, 2023
ca13b36
basic login
zexigong May 31, 2023
2c6a526
Show username
zexigong Jun 1, 2023
a38bd95
finish login/logout with drop down
zexigong Jun 1, 2023
0f982c2
return to previous page after login
zexigong Jun 2, 2023
b81edd6
set icons and wait page
zexigong Jun 9, 2023
63475c0
enable image action menu; add popup
zexigong Jun 20, 2023
e79679d
disable image remove menu; clean code
zexigong Jun 20, 2023
babb16c
show popup in imagegrid; convert text to wiki templates
zexigong Jun 23, 2023
a911fff
add upload
zexigong Jul 18, 2023
1f48030
update with new Oauth app, add UI and API call for upload
zexigong Aug 4, 2023
429893a
new Oauth app support upload and edit
zexigong Aug 7, 2023
e1caceb
update popup
zexigong Aug 23, 2023
2c597ca
add comment and item pull down
zexigong Aug 28, 2023
5718231
change request params with finnaId
zexigong Aug 31, 2023
e0c5504
add comment
zexigong Sep 1, 2023
1478d2f
Delete Oauth.js
zexigong Sep 1, 2023
5825b94
Wait until login response is handled before redirecting
tuukka Sep 4, 2023
47d6ddc
add translation
zexigong Sep 5, 2023
d024645
Merge branch 'upload' of https://github.com/zexigong/wikidocumentarie…
zexigong Sep 5, 2023
0edd3f7
Fix popup progression by removing template syntax error
tuukka Sep 5, 2023
ce44053
Remove an unnecessary debug function
tuukka Sep 5, 2023
d6b6d76
Produce prettier wikitext by including linebreaks
tuukka Sep 5, 2023
4f4f146
Fix logic to include the year always when we have one
tuukka Sep 5, 2023
9d76d5e
Add the FinnaReview template to copyrights from Finna
tuukka Sep 5, 2023
d766d9e
Support OAUTH_CLIENT{_ID,_SECRET} environment variables
tuukka Sep 5, 2023
1a1212f
Add local copy of pkce-challenge 4.0.1 from NPM
tuukka Sep 5, 2023
d424498
Fix pkce-challenge to work in our build system
tuukka Sep 5, 2023
fc5add0
Add OAuth code challenge for our non-confidential app
tuukka Sep 5, 2023
0ea9a31
Update en.json
susannaanas Sep 9, 2023
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
Prev Previous commit
Next Next commit
enable image action menu; add popup
zexigong committed Jun 20, 2023

Verified

This commit was signed with the committer’s verified signature.
OS-giulianasilva Giuliana Silva
commit 63475c08b9d6282164f82af8b8bdf3e2303b4ece
14 changes: 7 additions & 7 deletions src/components/ImageGrid.vue
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
</div>
<div class="thumb-image-header">
<div class="left-align">
<!-- <ImagesActionMenu v-bind:element="item"></ImagesActionMenu> -->
<ImagesActionMenu v-bind:element="item"></ImagesActionMenu>
<div
v-if="item.geoLocations != undefined && item.geoLocations.length > 0"
class="header-item"
@@ -36,7 +36,7 @@
<i class="wikiglyph wikiglyph-new-window thumb-image-glyph"></i>
</a>
</div>
<!--ImagesRemoveMenu></ImagesRemoveMenu-->
<ImagesRemoveMenu></ImagesRemoveMenu>
</div>
</div>
</div>
@@ -48,8 +48,8 @@

<script>
import ImageViewer from "@/components/image_viewer/ImageViewer";
// import ImagesActionMenu from '@/components/menu/ImagesActionMenu'
// import ImagesRemoveMenu from '@/components/menu/ImagesRemoveMenu'
import ImagesActionMenu from '@/components/menu/ImagesActionMenu';
import ImagesRemoveMenu from '@/components/menu/ImagesRemoveMenu';
export default {
name: "ImageGrid",
@@ -62,9 +62,9 @@ export default {
}
},
components: {
ImageViewer
// ImagesActionMenu,
// ImagesRemoveMenu,
ImageViewer,
ImagesActionMenu,
ImagesRemoveMenu,
},
methods: {
getCredits(item) {
22 changes: 20 additions & 2 deletions src/components/image_viewer/ImageViewer.vue
Original file line number Diff line number Diff line change
@@ -35,9 +35,11 @@
:tooltip="$t('general.menus.actionMenuTitle')"
:items="toolbarActionMenuItems"
@doMenuItemAction="onDoMenuItemAction"
@click="showPopUp()"
>
<div slot="menu-title">{{ $t('general.menus.actionMenuTitle') }}</div>
</ToolbarMenu>
<PopUp ref="popup"></PopUp>
<HeaderLink
v-if="element.infoURL"
class="toolbar-item neg"
@@ -472,6 +474,7 @@
import HeaderLink from "@/components/HeaderLink";
import Dataselect from "@/components/Dataselect";
import ToolbarMenu from "@/components/menu/ToolbarMenu";
import PopUp from "@/components/upload/Popup";
const MENU_ACTIONS = {
SELECT_HEADER: 0
@@ -500,14 +503,21 @@ export default {
{
id: MENU_ACTIONS.GEOLOCATE,
text: "topic_page.TopicImages.imagesActionMenu.doGeolocatingText"
},
{
id: MENU_ACTIONS.UPLOAD,
text: "topic_page.TopicImages.imagesActionMenu.upload"
}
]
],
clickPopUp: false,
};
},
components: {
HeaderLink,
Dataselect,
ToolbarMenu,
PopUp,
},
props: {
shouldShowDialog: Boolean
@@ -581,9 +591,17 @@ export default {
// case MENU_ACTIONS.GEOLOCATE:
// ;
// break;
case MENU_ACTIONS.SELECT_HEADER:
// case MENU_ACTIONS.SELECT_HEADER:
case MENU_ACTIONS.UPLOAD:
console.log("I click upload");
this.showPopUp();
break;
}
},
showPopUp() {
console.log("hahaha");
this.$refs.popup.show();
},
createMap() {
var ol = this.$ol;
48 changes: 48 additions & 0 deletions src/components/upload/Popup.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<template>
<div v-if="showModal" class="popup" >
<div class="popup-inner">
<slot></slot>
<button class="popup-close" @click.prevent="hide">
Close
</button>
</div>

</div>
</template>
<script>
export default{
name: 'PopUp', data() {
return {
showModal: false,}},
methods: {
show(){
this.showModal = true;
},
hide() {
this.showModal = false;
},
}
}
</script>
<style scoped>
.popup{
position: fixed;
top: 0;
left:0;
right:0;
bottom:0;
z-index:99;
background: rgba(0,0,0,0.5);
display:flex;
align-items: center;
justify-content: center;
}
.popup-inner{
background: #FFF;
padding:32px;
}
</style>
3 changes: 2 additions & 1 deletion src/store/translation/en.json
Original file line number Diff line number Diff line change
@@ -274,7 +274,8 @@
"menuTooltip": "Actions",
"doGeolocatingText": "Set the location...",
"showImageText": "Show image",
"selectFeatured": "Choose as a header image"
"selectFeatured": "Choose as a header image",
"upload" : "upload"
},
"imagesRemoveMenu": {
"menuTitle": "Remove the image because...",